From 7ad577f72a70e55d205d1431fde0486ba718d255 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sat, 22 Jan 2022 10:38:04 -0800 Subject: [PATCH] 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. --- pkgs/development/interpreters/ruby/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 8a20fa92857e..c676a7b05e55 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 \