From 4ac0f8e045b31feac792bd39fa26e5f12dc18fe7 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 22 Dec 2021 19:25:41 -0800 Subject: [PATCH] ruby: more consistent baseRuby reference removal --- pkgs/development/interpreters/ruby/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 3fc14665da2b..76346e168459 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -206,7 +206,9 @@ let sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig '' + opString useBaseRuby '' # Prevent the baseruby from being included in the closure. - sed -i "s|'--with-baseruby=${baseRuby}/bin/ruby'||" $rbConfig + ${removeReferencesTo}/bin/remove-references-to \ + -t ${baseRuby} \ + $rbConfig $out/lib/libruby* ''; disallowedRequisites = op (!jitSupport) stdenv.cc.cc