diff options
| author | arcnmx <arcnmx@users.noreply.github.com> | 2022-01-22 10:38:04 -0800 |
|---|---|---|
| committer | arcnmx <arcnmx@users.noreply.github.com> | 2022-01-23 10:56:31 -0800 |
| commit | 7ad577f72a70e55d205d1431fde0486ba718d255 (patch) | |
| tree | 294400663d8ea7d79d95f11af53b413c4ee180b5 /pkgs/development/interpreters/ruby | |
| parent | f865a2ca8980106e646b06c98e0dd4a80d7bff25 (diff) | |
| download | nixpkgs-7ad577f72a70e55d205d1431fde0486ba718d255.tar nixpkgs-7ad577f72a70e55d205d1431fde0486ba718d255.tar.gz nixpkgs-7ad577f72a70e55d205d1431fde0486ba718d255.tar.bz2 nixpkgs-7ad577f72a70e55d205d1431fde0486ba718d255.tar.lz nixpkgs-7ad577f72a70e55d205d1431fde0486ba718d255.tar.xz nixpkgs-7ad577f72a70e55d205d1431fde0486ba718d255.tar.zst nixpkgs-7ad577f72a70e55d205d1431fde0486ba718d255.zip | |
ruby: remove config indiscriminately
stripping config data was introduced in #138368, but was unintentionally added to the wrong `optionalString` condition. This isn't a problem in practice (as the relevant condition flag is enabled by default), but was unintended and therefore fixed here.
Diffstat (limited to 'pkgs/development/interpreters/ruby')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 8a20fa92857..c676a7b05e5 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -166,6 +166,8 @@ let # Bundler tries to create this directory postInstall = '' rbConfig=$(find $out/lib/ruby -name rbconfig.rb) + # Remove references to the build environment from the closure + sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig # Remove unnecessary groff reference from runtime closure, since it's big sed -i '/NROFF/d' $rbConfig ${ @@ -203,7 +205,6 @@ let # Add rbconfig shim so ri can find docs mkdir -p $devdoc/lib/ruby/site_ruby cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb - sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig '' + opString useBaseRuby '' # Prevent the baseruby from being included in the closure. ${removeReferencesTo}/bin/remove-references-to \ |