Permalink
Browse files

Document that Java packages should install JARs in $out/lib/java

  • Loading branch information...
1 parent 704f7d6 commit 8165e2ddb05185a5dcc8582d7973b69626da156a @edolstra edolstra committed Nov 8, 2012
Showing with 18 additions and 16 deletions.
  1. +6 −5 doc/language-support.xml
  2. +5 −4 pkgs/tools/misc/jdiskreport/builder.sh
  3. +7 −7 pkgs/tools/misc/jdiskreport/default.nix
View
@@ -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>
@@ -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
@@ -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";
- };
+ };
}

0 comments on commit 8165e2d

Please sign in to comment.