diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-05-31 22:59:33 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-05-31 22:59:33 +0200 |
| commit | 0ad178d902aee02c3538098aafe8a75ed619a8c6 (patch) | |
| tree | 44d28c6592335d12a1fba64d960e383a6c7df1ea | |
| parent | 12e7ca90d8ffe8984cc03eaf2247737519595223 (diff) | |
| download | nixpkgs-0ad178d902aee02c3538098aafe8a75ed619a8c6.tar nixpkgs-0ad178d902aee02c3538098aafe8a75ed619a8c6.tar.gz nixpkgs-0ad178d902aee02c3538098aafe8a75ed619a8c6.tar.bz2 nixpkgs-0ad178d902aee02c3538098aafe8a75ed619a8c6.tar.lz nixpkgs-0ad178d902aee02c3538098aafe8a75ed619a8c6.tar.xz nixpkgs-0ad178d902aee02c3538098aafe8a75ed619a8c6.tar.zst nixpkgs-0ad178d902aee02c3538098aafe8a75ed619a8c6.zip | |
tk: hardcode path to TK_LIBRARY
| -rw-r--r-- | pkgs/development/libraries/tk/8.6.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/tk/tk-8_6_13-find-library.patch | 25 |
2 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index 3e3d8ad5401..fbf45605175 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -14,4 +14,8 @@ callPackage ./generic.nix (args // { sha256 = "sha256-LmX6BpojNlRAo8VsVWuGc7XjKig4ANjZslfj9YTOBnU="; }; + patches = [ + ./tk-8_6_13-find-library.patch + ]; + }) diff --git a/pkgs/development/libraries/tk/tk-8_6_13-find-library.patch b/pkgs/development/libraries/tk/tk-8_6_13-find-library.patch new file mode 100644 index 00000000000..a055ade80cc --- /dev/null +++ b/pkgs/development/libraries/tk/tk-8_6_13-find-library.patch @@ -0,0 +1,25 @@ +diff --git a/generic/tkWindow.c b/generic/tkWindow.c +index fa25553..ad45598 100644 +--- a/generic/tkWindow.c ++++ b/generic/tkWindow.c +@@ -1045,6 +1045,7 @@ TkCreateMainWindow( + + Tcl_SetVar2(interp, "tk_patchLevel", NULL, TK_PATCH_LEVEL, TCL_GLOBAL_ONLY); + Tcl_SetVar2(interp, "tk_version", NULL, TK_VERSION, TCL_GLOBAL_ONLY); ++ Tcl_SetVar2(interp, "tk_library", NULL, TK_LIBRARY, TCL_GLOBAL_ONLY); + + tsdPtr->numMainWindows++; + return tkwin; +diff --git a/unix/Makefile.in b/unix/Makefile.in +index e98070e..f417753 100644 +--- a/unix/Makefile.in ++++ b/unix/Makefile.in +@@ -1033,7 +1033,7 @@ tkVisual.o: $(GENERIC_DIR)/tkVisual.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c + + tkWindow.o: $(GENERIC_DIR)/tkWindow.c tkUuid.h +- $(CC) -c $(CC_SWITCHES) -I. $(GENERIC_DIR)/tkWindow.c ++ $(CC) -c $(CC_SWITCHES) -I. -DTK_LIBRARY=\"${TK_LIBRARY}\" $(GENERIC_DIR)/tkWindow.c + + tkButton.o: $(GENERIC_DIR)/tkButton.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c |