1 files changed, 22 insertions, 21 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix
index d85448a9677c..02992e718718 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix
@@ -1,45 +1,46 @@
-{ stdenv, fetchFromGitHub, fetchpatch, libX11, libXt, withGraphics ? true }:
+{ stdenv
+, fetchFromGitHub
+, libX11
+, libXt
+, withGraphics ? true
+}:
 
 stdenv.mkDerivation rec {
   pname = "icon-lang";
-  version = "9.5.1";
+  version = "unstable-2020-02-05";
   src = fetchFromGitHub {
     owner = "gtownsend";
     repo = "icon";
-    rev = "rel${builtins.replaceStrings ["."] [""] version}";
-    sha256 = "1gkvj678ldlr1m5kjhx6zpmq11nls8kxa7pyy64whgakfzrypynw";
+    rev = "829cff33de4a21546fb269de3ef5acd7b4f0c0c7";
+    sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2";
   };
 
   buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ];
 
-  patches = [
-    # Patch on git master, likely won't be necessary in future release
-    (fetchpatch {
-      url = "https://github.com/gtownsend/icon/commit/bfc4a6004d0d3984c8066289b8d8e563640c4ddd.patch";
-      sha256 = "1pqapjghk10rb73a1mfflki2wipjy4kvnravhmrilkqzb9hd6v8m";
-      excludes = [
-        "doc/relnotes.htm"
-        "src/h/version.h"
-      ];
-    })
-  ];
-
   configurePhase =
     let
-      _name = if stdenv.isDarwin then "macintosh" else "linux";
+      target = if withGraphics then "X-Configure" else "Configure";
+      platform =
+        if stdenv.isLinux then "linux"
+        else if stdenv.isDarwin then "macintosh"
+        else if stdenv.isBSD then "bsd"
+        else if stdenv.isCygwin then "cygwin"
+        else if stdenv.isSunOS then "solaris"
+        else throw "unsupported system";
     in
-    ''
-      make ${stdenv.lib.optionalString withGraphics "X-"}Configure name=${_name}
-    '';
+    "make ${target} name=${platform}";
 
   installPhase = ''
     make Install dest=$out
+    rm $out/README
+    mkdir -p $out/share/doc
+    mv $out/doc $out/share/doc/icon
   '';
 
   meta = with stdenv.lib; {
     description = ''A very high level general-purpose programming language'';
     maintainers = with maintainers; [ vrthra yurrriq ];
-    platforms = with platforms; linux ++ darwin;
+    platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos;
     license = licenses.publicDomain;
     homepage = "https://www.cs.arizona.edu/icon/";
   };