mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
Merge pull request #280319 from trofi/ruby-modules-gemtype-eval
ruby-modules/bundled-common: do not define `gemType` for `null` packages
This commit is contained in:
commit
349431381b
@ -117,9 +117,10 @@ let
|
||||
|
||||
meta = { platforms = ruby.meta.platforms; } // meta;
|
||||
|
||||
passthru = rec {
|
||||
inherit ruby bundler gems confFiles envPaths;
|
||||
passthru = (lib.optionalAttrs (pname != null) {
|
||||
inherit (gems.${pname}) gemType;
|
||||
} // rec {
|
||||
inherit ruby bundler gems confFiles envPaths;
|
||||
|
||||
wrappedRuby = stdenv.mkDerivation {
|
||||
name = "wrapped-ruby-${pname'}";
|
||||
@ -172,7 +173,7 @@ let
|
||||
exit 1
|
||||
'';
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
basicEnv =
|
||||
|
Loading…
Reference in New Issue
Block a user