diff options
| -rw-r--r-- | doc/language-support.xml | 11 | ||||
| -rw-r--r-- | pkgs/tools/misc/jdiskreport/builder.sh | 9 | ||||
| -rw-r--r-- | pkgs/tools/misc/jdiskreport/default.nix | 14 |
3 files changed, 18 insertions, 16 deletions
diff --git a/doc/language-support.xml b/doc/language-support.xml index 47729a1b4ba9..6cc028c0b0a2 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -196,17 +196,18 @@ twisted = buildPythonPackage { </section> -<!-- -<section><title>Haskell</title> +<section><title>Java</title> -<para>TODO</para> +<para>Java packages should install JAR files in +<filename>$out/lib/java</filename>.</para> </section> -<section><title>Java</title> +<!-- +<section><title>Haskell</title> -<para>TODO; Java support needs lots of improvement</para> +<para>TODO</para> </section> 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"; - }; + }; } |