From bff57396f5c339ce8911caab22b3d311aeb47787 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 11 Aug 2011 13:27:43 +0000 Subject: [PATCH] openjdk: Add a fix for versions of nix not yet supporting multiple outputs svn path=/nixpkgs/trunk/; revision=28493 --- pkgs/development/compilers/openjdk/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index f7b000170a0..cb4d8990258 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -117,6 +117,9 @@ stdenv.mkDerivation rec { ensureDir $out cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out '' + (if jreOnly then "" else '' + if [ -z $jre ]; then + exit 0 + fi ensureDir $jre cp -av build/*/j2re-image/* $jre '');