diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 12:45:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 18:34:53 +0100 |
| commit | 9443129b08b37a6f4267d257cd8d42dd92a2539c (patch) | |
| tree | aec261361299cc2d85827dbcf5d03b594ae85e28 /pkgs/development/compilers/jdk/jdk7-linux.nix | |
| parent | f78534ca0f8ec63d79370eb2367605579efba088 (diff) | |
| parent | f6d51f7717cffd8b220ce02498db8b8359b5964c (diff) | |
| download | nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.gz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.bz2 nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.lz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.xz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.zst nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.zip | |
Merge master into stdenv-updates
Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)
Diffstat (limited to 'pkgs/development/compilers/jdk/jdk7-linux.nix')
| -rw-r--r-- | pkgs/development/compilers/jdk/jdk7-linux.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix index a7a5eccee9d5..7ef575ba807b 100644 --- a/pkgs/development/compilers/jdk/jdk7-linux.nix +++ b/pkgs/development/compilers/jdk/jdk7-linux.nix @@ -29,10 +29,10 @@ let requireFile { name = "UnlimitedJCEPolicyJDK7.zip"; url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; - sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh"; + sha256 = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; } else - null; + ""; in stdenv.mkDerivation { @@ -93,12 +93,13 @@ stdenv.mkDerivation { jrePath=$out/jre fi - if test -n "$jce"; then - unzip $jce - cp -v jce/*.jar $jrePath/lib/security + if test -n "${jce}"; then + unzip ${jce} + cp -v UnlimitedJCEPolicy/*.jar $jrePath/lib/security fi rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli + rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture} # set all the dynamic linkers find $out -type f -perm +100 \ |