diff options
| author | Yureka <yuka@yuka.dev> | 2023-01-21 16:43:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-21 16:43:07 +0100 |
| commit | 9f05e44db61e90f44b2831f051dd53c5e014ae3c (patch) | |
| tree | 49829a28a1d16d59a4e787588c5186021cdbc9c8 /pkgs/development/ruby-modules/gem | |
| parent | 2272f206cd8063ab87fbb8e47df5d1e2c7788826 (diff) | |
buildRubyGem: don't use the bash 'type' variable name (#211899)
https://github.com/NixOS/nixpkgs/issues/211671 There is also a fix with an stdenv rebuild in staging, but we don't want to wait so long...
Diffstat (limited to 'pkgs/development/ruby-modules/gem')
| -rw-r--r-- | pkgs/development/ruby-modules/gem/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 32bf8ed820799..dbb9e4f451cc4 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit ruby; inherit dontBuild; inherit dontStrip; - inherit type; + gemType = type; nativeBuildInputs = [ ruby makeWrapper @@ -143,7 +143,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { buildPhase = attrs.buildPhase or '' runHook preBuild - if [[ "$type" == "gem" ]]; then + if [[ "$gemType" == "gem" ]]; then if [[ -z "$gemspec" ]]; then gemspec="$(find . -name '*.gemspec')" echo "found the following gemspecs:" @@ -158,7 +158,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { gempkg=$(echo "$output" | grep -oP 'File: \K(.*)') echo "gem package built: $gempkg" - elif [[ "$type" == "git" ]]; then + elif [[ "$gemType" == "git" ]]; then git init # remove variations to improve the likelihood of a bit-reproducible output rm -rf .git/logs/ .git/hooks/ .git/index .git/FETCH_HEAD .git/ORIG_HEAD .git/refs/remotes/origin/HEAD .git/config |