Commit a326e13e authored by sinofp's avatar sinofp
Browse files

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.
parent 5e0ca229
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -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 [