public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correctly implement patching

Browse Source
This commit is contained in:
Joel Taylor 2014-08-08 19:09:28 -07:00 committed by Charles Strahan
parent 1edaff1a2a
commit 2dedbe6bbe
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/interpreters/ruby/gems.nix
View File

@ -22,13 +22,14 @@ self = rec {
# import an attrset full of gems, then override badly behaved ones # import an attrset full of gems, then override badly behaved ones
importGems = file: args: importGems = file: args:
let let
builtGems = callPackage file ({ inherit buildRubyGem; rubyLibs = self; } // args); preBuilt = callPackage file ({ inherit buildRubyGem; self = builtGems; } // args);
in 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 == 1 then {}
else patches."${gem}") else patches."${gem}")
else deriv) builtGems; else deriv) preBuilt);
in builtGems;
################################################################## ##################################################################
# stuff EVERYONE needs # stuff EVERYONE needs

4
pkgs/development/interpreters/ruby/patches.nix
View File

@ -20,6 +20,10 @@ in
extraWrapperFlags = "--prefix RUBYLIB : ."; extraWrapperFlags = "--prefix RUBYLIB : .";
}; };
barber = { gemFlags = "--ignore-dependencies"; };
ember_data_source = { gemFlags = "--ignore-dependencies"; };
ember_rails = { gemFlags = "--ignore-dependencies"; };
fakes3 = { fakes3 = {
postInstall = '' postInstall = ''
cd $out/${ruby.gemPath}/gems/* cd $out/${ruby.gemPath}/gems/*