* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
2012-01-20 15:29:04 +00:00
parent 1e7d074f1d b786ce664d
commit bafc4ff59d
11 changed files with 61 additions and 23 deletions
@@ -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)