diff options
Diffstat (limited to 'pkgs/development')
17 files changed, 41 insertions, 32 deletions
diff --git a/pkgs/development/compilers/jdk/default-1.4.nix b/pkgs/development/compilers/jdk/default-1.4.nix new file mode 100644 index 0000000000000..097af70bc1c9e --- /dev/null +++ b/pkgs/development/compilers/jdk/default-1.4.nix @@ -0,0 +1,9 @@ +{stdenv, fetchurl}: + +if stdenv.system == "i686-linux" + then + (import ./j2sdk-1.4.x-sun-linux.nix) { + inherit stdenv fetchurl; + } + else + false diff --git a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix index 89fd6ab2a5458..81ed022328439 100644 --- a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix +++ b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix @@ -1,6 +1,6 @@ /** - * This Nix expression requires the user to download the j2sdk - * distribution to /tmp. Please obtain j2sdk-1_5_0_05-linux-i586.bin + * This Nix expression requires the user to download the jdk + * distribution to /tmp. Please obtain jdk-1_5_0_05-linux-i586.bin * from java.sun.com by hand and place it in /tmp. Blame Sun, not me. * * Note that this is not necessary if someone has already pushed a @@ -19,6 +19,6 @@ derivation { system = stdenv.system; builder = ./builder.sh; pathname = "/tmp/jdk-1_5_0_05-linux-i586.bin"; - md5 = ""; + md5 = "2f83bf2a38fff1f8ac51b02ec7391ca3"; stdenv = stdenv; } diff --git a/pkgs/development/eclipse/ecj/builder.sh b/pkgs/development/eclipse/ecj/builder.sh index 67297e2fd87bc..1b3d86f44a5a7 100644 --- a/pkgs/development/eclipse/ecj/builder.sh +++ b/pkgs/development/eclipse/ecj/builder.sh @@ -12,10 +12,10 @@ mkdir -p $out/bin cat >> $out/bin/ecj <<EOF #! /bin/sh -export JAVA_HOME=$j2re +export JAVA_HOME=$jre export LANG="en_US" -$j2re/bin/java -cp $out/share/ecj/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main \$@ +$jre/bin/java -cp $out/share/ecj/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main \$@ EOF chmod u+x $out/bin/ecj diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index a0428608d16c0..44e2a1edd0d3f 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, ant, j2re}: +{stdenv, fetchurl, unzip, ant, jre}: stdenv.mkDerivation { name = "ecj-3.1"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { md5 = "19ad65d52005da5eaa1d3687b3a50de2"; }; - inherit j2re; - buildInputs = [unzip ant j2re]; + inherit jre; + buildInputs = [unzip ant jre]; } diff --git a/pkgs/development/interpreters/jre/default.nix b/pkgs/development/interpreters/jre/default.nix index 348703c17cea7..fd81dd18ceea7 100644 --- a/pkgs/development/interpreters/jre/default.nix +++ b/pkgs/development/interpreters/jre/default.nix @@ -2,7 +2,7 @@ if stdenv.system == "i686-linux" then - (import ./j2re-sun-linux.nix) { + (import ./jre-sun-linux.nix) { inherit stdenv fetchurl; } else diff --git a/pkgs/development/interpreters/jre/j2re-sun-linux.nix b/pkgs/development/interpreters/jre/jre-sun-linux.nix index b4d072107cb6c..b4d072107cb6c 100644 --- a/pkgs/development/interpreters/jre/j2re-sun-linux.nix +++ b/pkgs/development/interpreters/jre/jre-sun-linux.nix diff --git a/pkgs/development/libraries/java/aterm/default.nix b/pkgs/development/libraries/java/aterm/default.nix index 5aa11ea0a4a79..35b6ea258ed20 100644 --- a/pkgs/development/libraries/java/aterm/default.nix +++ b/pkgs/development/libraries/java/aterm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, j2sdk, sharedobjects, jjtraveler}: +{stdenv, fetchurl, jdk, sharedobjects, jjtraveler}: stdenv.mkDerivation { name = "aterm-java-1.6"; @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/aterm-java-1.6.tar.gz; md5 = "abf475dae2f5efca865fcdff871feb5e"; }; - buildInputs = [stdenv j2sdk sharedobjects jjtraveler]; + buildInputs = [stdenv jdk sharedobjects jjtraveler]; } diff --git a/pkgs/development/libraries/java/cup/builder.sh b/pkgs/development/libraries/java/cup/builder.sh index 9f9cc5cda6306..ecd33aa1363c2 100755 --- a/pkgs/development/libraries/java/cup/builder.sh +++ b/pkgs/development/libraries/java/cup/builder.sh @@ -3,8 +3,8 @@ set -e tar zxvf $src -$j2sdk/bin/javac java_cup/*.java -$j2sdk/bin/javac java_cup/runtime/*.java +$jdk/bin/javac java_cup/*.java +$jdk/bin/javac java_cup/runtime/*.java mkdir -p $out/java_cup/runtime diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix index 36c6e96332698..1181cef074ecc 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/development/libraries/java/cup/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, j2sdk} : +{stdenv, fetchurl, jdk} : stdenv.mkDerivation { name = "java-cup-10k"; @@ -9,5 +9,5 @@ stdenv.mkDerivation { md5 = "8b11edfec13c590ea443d0f0ae0da479"; }; - inherit j2sdk; + inherit jdk; } diff --git a/pkgs/development/libraries/java/jjtraveler/default.nix b/pkgs/development/libraries/java/jjtraveler/default.nix index ea2c3eb46de5b..01199f9e22fff 100644 --- a/pkgs/development/libraries/java/jjtraveler/default.nix +++ b/pkgs/development/libraries/java/jjtraveler/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, j2sdk}: +{stdenv, fetchurl, jdk}: stdenv.mkDerivation { name = "jjtraveler-0.4.3"; @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/JJTraveler-0.4.3.tar.gz; md5 = "35bf801ee61f042513ae88247fe1bf1d"; }; - buildInputs = [stdenv j2sdk]; + buildInputs = [stdenv jdk]; } diff --git a/pkgs/development/libraries/java/shared-objects/default.nix b/pkgs/development/libraries/java/shared-objects/default.nix index d863679c16e9e..cc76ca8ac4a48 100644 --- a/pkgs/development/libraries/java/shared-objects/default.nix +++ b/pkgs/development/libraries/java/shared-objects/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, j2sdk}: +{stdenv, fetchurl, jdk}: stdenv.mkDerivation { name = "shared-objects-1.4"; @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/shared-objects-1.4.tar.gz; md5 = "c1f2c58bd1a07be32da8a6b89354a11f"; }; - buildInputs = [stdenv j2sdk]; + buildInputs = [stdenv jdk]; } diff --git a/pkgs/development/tools/build-managers/apache-ant/builder.sh b/pkgs/development/tools/build-managers/apache-ant/builder.sh index 6a35394749eb4..f6fba7275d3dc 100644 --- a/pkgs/development/tools/build-managers/apache-ant/builder.sh +++ b/pkgs/development/tools/build-managers/apache-ant/builder.sh @@ -5,8 +5,8 @@ mkdir -p $out/bin || exit 1 cat >> $out/bin/ant <<EOF #! /bin/sh -export JAVA_HOME=$j2sdk -export JAVACMD=$j2sdk/bin/java +export JAVA_HOME=$jdk +export JAVACMD=$jdk/bin/java export ANT_OPTS="" export ANT_ARGS="" export LANG="en_US" diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index cbedddcee212b..2532db69f97f1 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, j2sdk, name}: +{stdenv, fetchurl, jdk, name}: let { body = stdenv.mkDerivation { name = name; builder = ./builder.sh; - buildInputs = [ant j2sdk]; - inherit ant j2sdk; + buildInputs = [ant jdk]; + inherit ant jdk; }; ant = diff --git a/pkgs/development/tools/java/jclasslib/builder.sh b/pkgs/development/tools/java/jclasslib/builder.sh index 56407b376e37b..2c9be51476c1e 100755 --- a/pkgs/development/tools/java/jclasslib/builder.sh +++ b/pkgs/development/tools/java/jclasslib/builder.sh @@ -14,9 +14,9 @@ mv build/jclasslib.jar $out/bin/ || exit 1 cat >> $out/bin/jclasslib <<EOF #! /bin/sh -export JAVA_HOME=$j2re +export JAVA_HOME=$jre -$j2re/bin/java -jar $out/bin/jclasslib.jar \$@ +$jre/bin/java -jar $out/bin/jclasslib.jar \$@ EOF chmod a+x $out/bin/jclasslib || exit 1 diff --git a/pkgs/development/tools/java/jclasslib/default.nix b/pkgs/development/tools/java/jclasslib/default.nix index f87edb3eab01f..dc0d475c4389a 100644 --- a/pkgs/development/tools/java/jclasslib/default.nix +++ b/pkgs/development/tools/java/jclasslib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xpf, j2re, ant}: +{stdenv, fetchurl, xpf, jre, ant}: stdenv.mkDerivation { name = "jclasslib-2.0"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { md5 = "31d91bb03fee23410689d2f1c4c439b1"; }; - inherit j2re xpf ant; + inherit jre xpf ant; buildInputs = [xpf ant]; } diff --git a/pkgs/development/tools/misc/swig/builder.sh b/pkgs/development/tools/misc/swig/builder.sh index d57a2199f7378..b4ac1b18a1f56 100644 --- a/pkgs/development/tools/misc/swig/builder.sh +++ b/pkgs/development/tools/misc/swig/builder.sh @@ -1,3 +1,3 @@ -buildInputs="$perl $python $j2sdk" +buildInputs="$perl $python $jdk" . $stdenv/setup genericBuild diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 1e14ddc8f299f..4cb3f1d0565e3 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -1,9 +1,9 @@ { perlSupport, pythonSupport, javaSupport -, stdenv, fetchurl, perl ? null, python ? null, j2sdk ? null}: +, stdenv, fetchurl, perl ? null, python ? null, jdk ? null}: assert perlSupport -> perl != null; assert pythonSupport -> python != null; -assert javaSupport -> j2sdk != null; +assert javaSupport -> jdk != null; stdenv.mkDerivation { name = "swig-1.3.19"; @@ -18,5 +18,5 @@ stdenv.mkDerivation { perl = if perlSupport then perl else null; python = if pythonSupport then python else null; - j2sdk = if javaSupport then j2sdk else null; + jdk = if javaSupport then jdk else null; } \ No newline at end of file |