From e50afd12b7647921a18336add9fd81e8798b3d6d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 May 2015 03:17:33 +0200
Subject: alloy: use installPhase instead of ./builder.sh

Also pass on any arguments from the shell wrapper to the .jar.
And be less clever with shell strings.
---
 pkgs/development/tools/alloy/builder.sh  | 16 ----------------
 pkgs/development/tools/alloy/default.nix | 21 +++++++++++++++++----
 2 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/tools/alloy/builder.sh

(limited to 'pkgs/development/tools/alloy')

diff --git a/pkgs/development/tools/alloy/builder.sh b/pkgs/development/tools/alloy/builder.sh
deleted file mode 100644
index e737fc5eec73..000000000000
--- a/pkgs/development/tools/alloy/builder.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-source $stdenv/setup
-
-jar=${src##*/}
-jar=$out/share/alloy/${jar#*-}
-
-install -Dm644 $src $jar
-
-cat << EOF > alloy
-#! $SHELL
-exec $jre/bin/java -jar $jar
-EOF
-
-install -Dm755 alloy $out/bin/alloy
-
-install -Dm644 $icon $out/share/pixmaps/alloy.png
-cp -r ${desktopItem}/share/applications $out/share
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index d25ccc1a7a5e..da247072b070 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -38,11 +38,24 @@ stdenv.mkDerivation rec {
     categories = "Development;IDE;Education;";
   };
 
-
   buildInputs = [ jre ];
-  inherit jre;
 
-  icon = ./icon.png;
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    jar=`basename ${src}`
+    jar=$out/share/alloy/alloy${version}.jar
+
+    install -Dm644 ${src} $jar
+
+    cat << EOF > alloy
+    #!${stdenv.shell}
+    exec ${jre}/bin/java -jar $jar "\''${@}"
+    EOF
+
+    install -Dm755 alloy $out/bin/alloy
 
-  builder = ./builder.sh;
+    install -Dm644 ${./icon.png} $out/share/pixmaps/alloy.png
+    cp -r ${desktopItem}/share/applications $out/share
+  '';
 }
-- 
cgit 1.4.1