diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-13 13:16:17 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-13 13:16:17 +0100 |
| commit | 6fb27abf3330139b7f5a868ae988fcf04284a1ca (patch) | |
| tree | 4e5772e2bf7b785413ea69d15deb38e53925cf6e /pkgs/tools/misc | |
| parent | 78d3180dbe8896500a35a848675462aeafe6f1b9 (diff) | |
| parent | cf4acab5670e9c04cbd924ad0835ba5a5219b296 (diff) | |
| download | nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.gz nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.bz2 nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.lz nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.xz nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.tar.zst nixlib-6fb27abf3330139b7f5a868ae988fcf04284a1ca.zip | |
Merge branch 'java'
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/jdiskreport/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/smc/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh index cdc5f94bde0c..f95dafedd32a 100644 --- a/pkgs/tools/misc/jdiskreport/builder.sh +++ b/pkgs/tools/misc/jdiskreport/builder.sh @@ -4,12 +4,12 @@ unzip $src jar=$(ls */*.jar) -mkdir -p $out/lib/java -mv $jar $out/lib/java +mkdir -p $out/share/java +mv $jar $out/share/java mkdir -p $out/bin cat > $out/bin/jdiskreport <<EOF #! $SHELL -e -exec $jre/bin/java -jar $out/lib/java/$(basename $jar) +exec $jre/bin/java -jar $out/share/java/$(basename $jar) EOF chmod +x $out/bin/jdiskreport diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index a12a40e8ed71..c7c389a3733f 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -14,16 +14,16 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/smc" mkdir -p "$out/share/smc/lib" mkdir -p "$out/share/icons" - mkdir -p "$out/lib/java" + mkdir -p "$out/share/java" - cp bin/Smc.jar "$out/lib/java/" + cp bin/Smc.jar "$out/share/java/" cp -r examples/ docs/ tools/ README.txt LICENSE.txt "$out/share/smc/" cp -r lib/* "$out/share/smc/lib/" cp misc/smc.ico "$out/share/icons/" cat > "$out/bin/smc" << EOF #!${stdenv.shell} - ${jre}/bin/java -jar "$out/lib/java/Smc.jar" "\$@" + ${jre}/bin/java -jar "$out/share/java/Smc.jar" "\$@" EOF chmod a+x "$out/bin/smc" ''; |