call patches with the right nix

This commit is contained in:
Joel Taylor 2014-08-14 17:55:10 -07:00 committed by Charles Strahan
parent f14f73da76
commit 05238cd353

View File

@ -21,7 +21,7 @@ self = rec {
# import an attrset full of gems, then override badly behaved ones
importGems = file: args:
let
patches = callPackage ./patches.nix { gems = builtGems; };
patches = callPackage ./patches.nix { inherit ruby; gems = builtGems; };
preBuilt = callPackage file ({ inherit buildRubyGem; self = builtGems; } // args);
builtGems = self // (lib.mapAttrs (gem: deriv:
if patches ? "${gem}"
@ -60,6 +60,11 @@ self = rec {
doCheck = false; # check depends on rspec!
};
json = buildRubyGem {
name = "json-1.8.1";
sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn";
};
rspec = rspec_3_0;
rspec_3_0 = buildRubyGem {