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

Merge pull request #7404 from cstrahan/bundlerenv-fixes 

Bundlerenv fixes
This commit is contained in:
Daniel Peebles 2015-04-17 23:13:08 -04:00
parent c6234ad07b 7fc3b002e6
commit 80f4b81615
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
View File

@ -31,7 +31,7 @@ in
{
charlock_holmes = attrs: {
buildInputs = [ which icu ];
buildInputs = [ which icu zlib ];
};
ffi = attrs: {

22
pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb
View File

@ -74,16 +74,24 @@ Bundler::Fetcher.class_eval do
spec_list = gem_names.map do |name|
spec = Bundler.nix_gemspecs.detect {|spec| spec.name == name }
dependencies = spec.dependencies.
select {|dep| dep.type != :development}.
map do |dep|
deps_list << dep.name
dep
end
if spec.nil?
msg = "WARNING: Could not find gemspec for '#{name}'"
Bundler.ui.warn msg
nil
else
dependencies = spec.dependencies.
select {|dep| dep.type != :development}.
map do |dep|
deps_list << dep.name
dep
end
[spec.name, spec.version, spec.platform, dependencies]
[spec.name, spec.version, spec.platform, dependencies]
end
end
spec_list.compact!
[spec_list, deps_list.uniq]
end
end