From 5e071cd74de9c525f7d40e5d94acc362df6be856 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 26 Oct 2012 13:19:54 +0400 Subject: [PATCH] OK, this version definitely builds both ways --- pkgs/development/compilers/openjdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index ee64a563a32..a5a915ae642 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