diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-08 15:18:09 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-08 16:31:08 +0100 |
commit | 8165e2ddb05185a5dcc8582d7973b69626da156a (patch) | |
tree | 65ba5f3ad09bd3805618c49b96075c93fb190f7d /pkgs/tools | |
parent | 704f7d6a2cb4d3b9c4457a761321e68a8519ae7e (diff) | |
download | nixlib-8165e2ddb05185a5dcc8582d7973b69626da156a.tar nixlib-8165e2ddb05185a5dcc8582d7973b69626da156a.tar.gz nixlib-8165e2ddb05185a5dcc8582d7973b69626da156a.tar.bz2 nixlib-8165e2ddb05185a5dcc8582d7973b69626da156a.tar.lz nixlib-8165e2ddb05185a5dcc8582d7973b69626da156a.tar.xz nixlib-8165e2ddb05185a5dcc8582d7973b69626da156a.tar.zst nixlib-8165e2ddb05185a5dcc8582d7973b69626da156a.zip |
Document that Java packages should install JARs in $out/lib/java
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/jdiskreport/builder.sh | 9 | ||||
-rw-r--r-- | pkgs/tools/misc/jdiskreport/default.nix | 14 |
2 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh index 1e73b674c157..cdc5f94bde0c 100644 --- a/pkgs/tools/misc/jdiskreport/builder.sh +++ b/pkgs/tools/misc/jdiskreport/builder.sh @@ -2,13 +2,14 @@ source $stdenv/setup unzip $src -mkdir -p $out/jars -mv */*.jar $out/jars -jar=$(ls $out/jars/jdiskreport-*.jar) +jar=$(ls */*.jar) + +mkdir -p $out/lib/java +mv $jar $out/lib/java mkdir -p $out/bin cat > $out/bin/jdiskreport <<EOF #! $SHELL -e -exec $jdk/bin/java -jar $jar +exec $jre/bin/java -jar $out/lib/java/$(basename $jar) EOF chmod +x $out/bin/jdiskreport diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 7a4de418a8c3..2457668d5b02 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, unzip, jdk }: +{ stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { name = "jdiskreport-1.4.0"; - + builder = ./builder.sh; - + src = fetchurl { url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_0.zip; sha256 = "0kx43480p89wlyza94lzqygqfafsdf964syc2c24q28y42psz4kd"; }; - + buildInputs = [ unzip ]; - - inherit jdk; + + inherit jre; meta = { homepage = http://www.jgoodies.com/freeware/jdiskreport/; description = "A graphical utility to visualize disk usage"; license = "unfree-redistributable"; - }; + }; } |