passthru ruby, make stdenv overridable

This commit is contained in:
Charles Strahan 2014-11-09 21:31:48 +00:00
parent 2a3f2cfce8
commit 2b0750f87a

View file

@ -5,6 +5,7 @@ lib.makeOverridable (
{ name { name
, ruby ? defs.ruby , ruby ? defs.ruby
, rubygems ? (rubygemsFun ruby) , rubygems ? (rubygemsFun ruby)
, stdenv ? ruby.stdenv
, namePrefix ? "${ruby.name}" + "-" , namePrefix ? "${ruby.name}" + "-"
, buildInputs ? [] , buildInputs ? []
, doCheck ? false , doCheck ? false
@ -13,7 +14,8 @@ lib.makeOverridable (
, gemPath ? [] , gemPath ? []
, ...} @ attrs: , ...} @ attrs:
ruby.stdenv.mkDerivation (attrs // { stdenv.mkDerivation (attrs // {
inherit ruby rubygems;
inherit doCheck; inherit doCheck;
buildInputs = [ rubygems makeWrapper git ] ++ buildInputs; buildInputs = [ rubygems makeWrapper git ] ++ buildInputs;