From c8438227293eb0f2c0f1bf8ea48198620dc3a0d5 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 26 Jul 2022 08:22:32 -0400 Subject: [PATCH] poke: only wrap poke-gui with TCLLIBPATH --- pkgs/applications/editors/poke/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index d8f2dcf1ffcd..1bfd690dd24f 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -5,10 +5,9 @@ , help2man , pkg-config , texinfo -, makeWrapper , boehmgc , readline -, guiSupport ? false, tcl, tcllib, tk +, guiSupport ? false, makeWrapper, tcl, tcllib, tk , miSupport ? true, json_c , nbdSupport ? !stdenv.isDarwin, libnbd , textStylingSupport ? true @@ -75,6 +74,15 @@ in stdenv.mkDerivation rec { moveToOutput share/vim "$out" ''; + postFixup = lib.optionalString guiSupport '' + wrapProgram "$out/bin/poke-gui" \ + --prefix TCLLIBPATH ' ' "$TCLLIBPATH" + + # Prevent tclPackageHook from auto-wrapping all binaries, we only + # need to wrap poke-gui + unset TCLLIBPATH + ''; + passthru = { updateScript = writeScript "update-poke" '' #!/usr/bin/env nix-shell