Author: ludo
Date: Thu Jan 19 22:29:26 2012
New Revision: 31727
URL: https://nixos.org/websvn/nix/?rev=31727&sc=1
Log:
overrideDerivation: Check whether `hostDrv' and `buildDrv' are present.
Modified:
nixpkgs/trunk/pkgs/lib/customisation.nix
Modified: nixpkgs/trunk/pkgs/lib/customisation.nix
==============================================================================
--- nixpkgs/trunk/pkgs/lib/customisation.nix Thu Jan 19 22:18:34 2012
(r31726)
+++ nixpkgs/trunk/pkgs/lib/customisation.nix Thu Jan 19 22:29:26 2012
(r31727)
@@ -42,9 +42,14 @@
in newDrv //
{ meta = if drv ? meta then drv.meta else {};
passthru = if drv ? passthru then drv.passthru else {};
- hostDrv = overrideDerivation drv.hostDrv f;
- buildDrv = overrideDerivation drv.buildDrv f;
- };
+ }
+ //
+ (if (drv ? hostDrv && drv ? buildDrv)
+ then {
+ hostDrv = overrideDerivation drv.hostDrv f;
+ buildDrv = overrideDerivation drv.buildDrv f;
+ }
+ else { });
# usage: (you can use override multiple times)
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
