diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
| commit | ee04ffcb550809f7d97d709ff4ec709a21b30ab9 (patch) | |
| tree | 470bdb3f97b0ab18d3abeec3e1f59db7a4af34ed /pkgs/development/compilers/jdk/default-5.nix | |
| parent | 3f1a32c266f792290cb08c45ab40f22a43cb13cb (diff) | |
| parent | 97d4a54698a4dea4b57ec4124591d75a740ee44e (diff) | |
| download | nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.gz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.bz2 nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.lz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.xz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.zst nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.zip | |
Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
Diffstat (limited to 'pkgs/development/compilers/jdk/default-5.nix')
| -rw-r--r-- | pkgs/development/compilers/jdk/default-5.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/jdk/default-5.nix b/pkgs/development/compilers/jdk/default-5.nix index fb25cd704c44..dfd4e31f4b37 100644 --- a/pkgs/development/compilers/jdk/default-5.nix +++ b/pkgs/development/compilers/jdk/default-5.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, requireFile}: if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then (import ./jdk5-oracle-linux.nix) { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip requireFile; } else abort "the Java 5 SDK is not supported on this platform" |