summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorMartin Bravenboer <martin.bravenboer@logicblox.com>2005-09-17 23:58:51 +0000
committerMartin Bravenboer <martin.bravenboer@logicblox.com>2005-09-17 23:58:51 +0000
commit4c70ef7e5dc4e65c989160a54ad104beaa1b10d5 (patch)
treec8e0fff64e5565608c717839fa7d25c20d9b6f35 /pkgs/tools
parent3919e7593ae7feef27c91842a2c49a7539ee7a01 (diff)
downloadnixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar
nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.gz
nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.bz2
nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.lz
nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.xz
nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.zst
nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.zip
Cleaning up the java naming conventions
svn path=/nixpkgs/trunk/; revision=3871
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/text/xml/jing/jing-script.nix4
-rw-r--r--pkgs/tools/text/xml/jing/script-builder.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/text/xml/jing/jing-script.nix b/pkgs/tools/text/xml/jing/jing-script.nix
index 617836f9325d..d6433f43a0cf 100644
--- a/pkgs/tools/text/xml/jing/jing-script.nix
+++ b/pkgs/tools/text/xml/jing/jing-script.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, j2re, unzip} :
+{stdenv, fetchurl, jre, unzip} :
 
 stdenv.mkDerivation {
   name = "jing-tools-20030619";
@@ -8,5 +8,5 @@ stdenv.mkDerivation {
     inherit stdenv fetchurl unzip;
   };
 
-  inherit j2re;
+  inherit jre;
 }
\ No newline at end of file
diff --git a/pkgs/tools/text/xml/jing/script-builder.sh b/pkgs/tools/text/xml/jing/script-builder.sh
index fa9f727e1311..b0c4648404c5 100644
--- a/pkgs/tools/text/xml/jing/script-builder.sh
+++ b/pkgs/tools/text/xml/jing/script-builder.sh
@@ -5,10 +5,10 @@ mkdir -p $out/bin || exit 1
 cat >> $out/bin/jing <<EOF
 #! /bin/sh
 
-export JAVA_HOME=$j2re
+export JAVA_HOME=$jre
 export LANG="en_US"
 
-$j2re/bin/java -jar $jing/bin/jing.jar \$@
+$jre/bin/java -jar $jing/bin/jing.jar \$@
 EOF
 
 chmod a+x $out/bin/jing || exit 1