Author: shlevy
Date: Thu Aug 11 13:27:43 2011
New Revision: 28493
URL: https://svn.nixos.org/websvn/nix/?rev=28493&sc=1
Log:
openjdk: Add a fix for versions of nix not yet supporting multiple outputs
Modified:
nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix Thu Aug
11 13:03:51 2011 (r28492)
+++ nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix Thu Aug
11 13:27:43 2011 (r28493)
@@ -117,6 +117,9 @@
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
'');
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
