From a326e13ecdbaebcdd7f612486603c3209a9aa2ac Mon Sep 17 00:00:00 2001 From: sinofp Date: Mon, 12 Aug 2024 16:05:39 +0100 Subject: [PATCH] remind: Fix $out expansion for tkremind In the last commit to remind, double quotes were replaced by single quotes. This change disabled the parameter expansion for remind, causing an error when starting tkremind: Error in startup script: can't read "out": no such variable while executing "set Remind "$out/bin/remind"" (file "/nix/store/p2ha6a4ybw7m6cy8mindb15ay9129kfa-remind-05.00.02/bin/.tkremind-wrapped" line 216) Reverting to double quotes allows Bash to correctly expand the $out parameter. --- pkgs/by-name/re/remind/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 34fed0a25a05..78ae694b1659 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -33,9 +33,9 @@ tcl.mkTclDerivation rec { # Pango and Cairo Perl modules. substituteInPlace scripts/tkremind \ --replace-fail "exec wish" "exec ${lib.getExe' tk "wish"}" \ - --replace-fail 'set Remind "remind"' 'set Remind "$out/bin/remind"' \ - --replace-fail 'set Rem2PS "rem2ps"' 'set Rem2PS "$out/bin/rem2ps"' \ - --replace-fail 'set Rem2PDF "rem2pdf"' 'set Rem2PDF "$out/bin/rem2pdf"' + --replace-fail 'set Remind "remind"' "set Remind \"$out/bin/remind\"" \ + --replace-fail 'set Rem2PS "rem2ps"' "set Rem2PS \"$out/bin/rem2ps\"" \ + --replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\"" ''; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [