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:
Mario Rodas 2024-01-12 00:17:02 -05:00 committed by GitHub
commit 349431381b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 =