diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2012-10-26 13:19:54 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2012-10-26 13:19:54 +0400 |
commit | 5e071cd74de9c525f7d40e5d94acc362df6be856 (patch) | |
tree | 2030eba11fb9545937c960f7d45571a8da326221 /pkgs/development/compilers/openjdk | |
parent | 27cdf7af771d212fc63aa151326593f74b7c51fb (diff) | |
download | nixlib-5e071cd74de9c525f7d40e5d94acc362df6be856.tar nixlib-5e071cd74de9c525f7d40e5d94acc362df6be856.tar.gz nixlib-5e071cd74de9c525f7d40e5d94acc362df6be856.tar.bz2 nixlib-5e071cd74de9c525f7d40e5d94acc362df6be856.tar.lz nixlib-5e071cd74de9c525f7d40e5d94acc362df6be856.tar.xz nixlib-5e071cd74de9c525f7d40e5d94acc362df6be856.tar.zst nixlib-5e071cd74de9c525f7d40e5d94acc362df6be856.zip |
OK, this version definitely builds both ways
Diffstat (limited to 'pkgs/development/compilers/openjdk')
-rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index ee64a563a32c..a5a915ae642a 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out - pushd $out/lib/security || pushd $out/jre/lib/security + pushd $out/${if ! jreOnly then "jre/" else ""}lib/security rm cacerts perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt popd |