From f6f3baff2a183679dea37f70f6f38391d99b8234 Mon Sep 17 00:00:00 2001
From: V <v@anomalous.eu>
Date: Fri, 4 Sep 2020 07:08:37 +0200
Subject: icon-lang: 9.5.1 -> 9.5.20i

---
 .../development/interpreters/icon-lang/default.nix | 46 +++++++++-------------
 1 file changed, 19 insertions(+), 27 deletions(-)

(limited to 'pkgs/development/interpreters/icon-lang')

diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix
index d85448a9677c..8190dc0f29f4 100644
--- a/pkgs/development/interpreters/icon-lang/default.nix
+++ b/pkgs/development/interpreters/icon-lang/default.nix
@@ -1,45 +1,37 @@
-{ stdenv, fetchFromGitHub, fetchpatch, libX11, libXt, withGraphics ? true }:
+{ stdenv, fetchFromGitHub
+, libX11, libXt
+, withGraphics ? true
+}:
 
 stdenv.mkDerivation rec {
   pname = "icon-lang";
-  version = "9.5.1";
+  version = "9.5.20i";
+
   src = fetchFromGitHub {
     owner = "gtownsend";
     repo = "icon";
-    rev = "rel${builtins.replaceStrings ["."] [""] version}";
-    sha256 = "1gkvj678ldlr1m5kjhx6zpmq11nls8kxa7pyy64whgakfzrypynw";
+    rev = "v${version}";
+    sha256 = "0072b3jk8mc94w818z8bklhjdf9rf0d9a7lkvw40pz3niy7zv84s";
   };
 
   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";
-    in
-    ''
-      make ${stdenv.lib.optionalString withGraphics "X-"}Configure name=${_name}
-    '';
+  configurePhase = let
+    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 ${target} name=${platform}";
 
-  installPhase = ''
-    make Install dest=$out
-  '';
+  installPhase = "make Install dest=$out";
 
   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/";
   };
-- 
cgit v1.2.3