diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-20 15:29:04 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-20 15:29:04 +0000 |
| commit | bafc4ff59d1547aa0437e3aba1eab6fb0a7f4d21 (patch) | |
| tree | d4193addcfc3c73d0f5189d5dc0934b05200c656 /pkgs/lib | |
| parent | 1e7d074f1d15393d07281e1b36b8d6b3b6445b1c (diff) | |
| parent | b786ce664df777fc5e061a2d670306ee54b25615 (diff) | |
| download | nixlib-bafc4ff59d1547aa0437e3aba1eab6fb0a7f4d21.tar nixlib-bafc4ff59d1547aa0437e3aba1eab6fb0a7f4d21.tar.gz nixlib-bafc4ff59d1547aa0437e3aba1eab6fb0a7f4d21.tar.bz2 nixlib-bafc4ff59d1547aa0437e3aba1eab6fb0a7f4d21.tar.lz nixlib-bafc4ff59d1547aa0437e3aba1eab6fb0a7f4d21.tar.xz nixlib-bafc4ff59d1547aa0437e3aba1eab6fb0a7f4d21.tar.zst nixlib-bafc4ff59d1547aa0437e3aba1eab6fb0a7f4d21.zip | |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
Diffstat (limited to 'pkgs/lib')
| -rw-r--r-- | pkgs/lib/customisation.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index 49ae440a7299..54965ffb5804 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -42,9 +42,14 @@ rec { 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) |