From a49a274abf77dbd6f698e5b6a72bb2b4848d5337 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 7 May 2021 12:51:47 -0500 Subject: [PATCH] Revert "xconq: Simplify package with tcl.tclPackageHook" This reverts commit 113826a892512eb2e19985310fd7d4a39db4d75e, which ended up breaking the Tk import at runtime. --- pkgs/games/xconq/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix index 6d7c9f4e6fbb..8f4366fbcb87 100644 --- a/pkgs/games/xconq/default.nix +++ b/pkgs/games/xconq/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cpio xorgproto libX11 libXmu libXaw libXt tcl tk libXext - fontconfig makeWrapper tcl.tclPackageHook ]; + fontconfig makeWrapper ]; configureFlags = [ "--enable-alternate-scoresdir=scores" @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { sed -re 's@MediumBlue@LightBlue@g' -i tcltk/tkconq.tcl ''; + postInstall = '' + for file in $out/bin/*; do + wrapProgram $file --prefix TCLLIBPATH ' ' "${tk}/lib" + done + ''; + meta = with lib; { description = "A programmable turn-based strategy game"; maintainers = with maintainers; [ raskin ];