Merge pull request #117727 from edude03/patch-5

Use minimal git for fetching gems
This commit is contained in:
Sandro 2021-03-27 02:44:02 +01:00 committed by GitHub
commit 5a9bce6789
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18,7 +18,7 @@
# Normal gem packages can be used outside of bundler; a binstub is created in # Normal gem packages can be used outside of bundler; a binstub is created in
# $out/bin. # $out/bin.
{ lib, fetchurl, fetchgit, makeWrapper, git, darwin { lib, fetchurl, fetchgit, makeWrapper, gitMinimal, darwin
, ruby, bundler , ruby, bundler
} @ defs: } @ defs:
@ -89,7 +89,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
buildInputs = [ buildInputs = [
ruby makeWrapper ruby makeWrapper
] ++ lib.optionals (type == "git") [ git ] ] ++ lib.optionals (type == "git") [ gitMinimal ]
++ lib.optionals (type != "gem") [ bundler ] ++ lib.optionals (type != "gem") [ bundler ]
++ lib.optional stdenv.isDarwin darwin.libobjc ++ lib.optional stdenv.isDarwin darwin.libobjc
++ buildInputs; ++ buildInputs;