patch logic

This commit is contained in:
Joel Taylor 2014-08-18 14:56:00 -07:00 committed by Charles Strahan
parent 9c8c4c8655
commit 4a5e725a00

View File

@ -26,7 +26,7 @@ self = rec {
builtGems = self // (lib.mapAttrs (gem: deriv: builtGems = self // (lib.mapAttrs (gem: deriv:
if patches ? "${gem}" if patches ? "${gem}"
then lib.overrideDerivation deriv (oldAttrs: then lib.overrideDerivation deriv (oldAttrs:
if oldAttrs ? dontPatch && oldAttrs.dontPatch == 1 then {} if oldAttrs ? dontPatch && !(oldAttrs.dontPatch == false || oldAttrs.dontPatch == null) then {}
else patches."${gem}") else patches."${gem}")
else deriv) preBuilt); else deriv) preBuilt);
in builtGems; in builtGems;