public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eelco Dolstra
2012-11-08 16:31:08 +01:00
parent 704f7d6a2c
commit 8165e2ddb0
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/language-support.xml
+6 -5
View File
@@ -196,17 +196,18 @@ twisted = buildPythonPackage {
</section> </section>
<!-- <section><title>Java</title>
<section><title>Haskell</title>
<para>TODO</para> <para>Java packages should install JAR files in
<filename>$out/lib/java</filename>.</para>
</section> </section>
<section><title>Java</title> <!--
<section><title>Haskell</title>
<para>TODO; Java support needs lots of improvement</para> <para>TODO</para>
</section> </section>
pkgs/tools/misc/jdiskreport/builder.sh
+5 -4
View File
@@ -2,13 +2,14 @@ source $stdenv/setup
unzip $src unzip $src
mkdir -p $out/jars jar=$(ls */*.jar)
mv */*.jar $out/jars
jar=$(ls $out/jars/jdiskreport-*.jar) mkdir -p $out/lib/java
mv $jar $out/lib/java
mkdir -p $out/bin mkdir -p $out/bin
cat > $out/bin/jdiskreport <<EOF cat > $out/bin/jdiskreport <<EOF
#! $SHELL -e #! $SHELL -e
exec $jdk/bin/java -jar $jar exec $jre/bin/java -jar $out/lib/java/$(basename $jar)
EOF EOF
chmod +x $out/bin/jdiskreport chmod +x $out/bin/jdiskreport
pkgs/tools/misc/jdiskreport/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, jdk }: { stdenv, fetchurl, unzip, jre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jdiskreport-1.4.0"; name = "jdiskreport-1.4.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ unzip ]; buildInputs = [ unzip ];
inherit jdk; inherit jre;
meta = { meta = {
homepage = http://www.jgoodies.com/freeware/jdiskreport/; homepage = http://www.jgoodies.com/freeware/jdiskreport/;