movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

ruby: remove config indiscriminately

Browse source 
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.
This commit is contained in:
arcnmx 2022-01-22 10:38:04 -08:00
parent f865a2ca89
commit 7ad577f72a
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/interpreters/ruby/default.nix
View file

@ -166,6 +166,8 @@ let
# Bundler tries to create this directory # Bundler tries to create this directory
postInstall = '' postInstall = ''
rbConfig=$(find $out/lib/ruby -name rbconfig.rb) 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 # Remove unnecessary groff reference from runtime closure, since it's big
sed -i '/NROFF/d' $rbConfig sed -i '/NROFF/d' $rbConfig
${ ${
@ -203,7 +205,6 @@ let
# Add rbconfig shim so ri can find docs # Add rbconfig shim so ri can find docs
mkdir -p $devdoc/lib/ruby/site_ruby mkdir -p $devdoc/lib/ruby/site_ruby
cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb 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 '' '' + opString useBaseRuby ''
# Prevent the baseruby from being included in the closure. # Prevent the baseruby from being included in the closure.
${removeReferencesTo}/bin/remove-references-to \ ${removeReferencesTo}/bin/remove-references-to \