diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-05-09 03:17:33 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-05-09 03:17:33 +0200 |
commit | e50afd12b7647921a18336add9fd81e8798b3d6d (patch) | |
tree | 9dfdd1196f5dbfb90cd19632d9ce0dfed4562cbb /pkgs/development/tools/alloy | |
parent | 8c39547fc258068e13e9dd14f6e7f290ed840428 (diff) | |
download | nixlib-e50afd12b7647921a18336add9fd81e8798b3d6d.tar nixlib-e50afd12b7647921a18336add9fd81e8798b3d6d.tar.gz nixlib-e50afd12b7647921a18336add9fd81e8798b3d6d.tar.bz2 nixlib-e50afd12b7647921a18336add9fd81e8798b3d6d.tar.lz nixlib-e50afd12b7647921a18336add9fd81e8798b3d6d.tar.xz nixlib-e50afd12b7647921a18336add9fd81e8798b3d6d.tar.zst nixlib-e50afd12b7647921a18336add9fd81e8798b3d6d.zip |
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.
Diffstat (limited to 'pkgs/development/tools/alloy')
-rw-r--r-- | pkgs/development/tools/alloy/builder.sh | 16 | ||||
-rw-r--r-- | pkgs/development/tools/alloy/default.nix | 21 |
2 files changed, 17 insertions, 20 deletions
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 + ''; } |