public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tk: fix issue #1479

This commit is contained in:
Song Wenwu 2014-01-25 10:36:20 +08:00
parent b6cc977580
commit 299af2ff45
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/tk/default.nix
View File

@ -7,6 +7,8 @@ stdenv.mkDerivation {
url = "mirror://sourceforge/tcl/tk8.5.15-src.tar.gz"; url = "mirror://sourceforge/tcl/tk8.5.15-src.tar.gz";
sha256 = "0grj0k0hljvwiz913pafqibz18fzk9xjxf0nzqrd9zdls036fp41"; sha256 = "0grj0k0hljvwiz913pafqibz18fzk9xjxf0nzqrd9zdls036fp41";
}; };
patches = [ ./different-prefix-with-tcl.patch ];
postInstall = '' postInstall = ''
ln -s $out/bin/wish* $out/bin/wish ln -s $out/bin/wish* $out/bin/wish

22
pkgs/development/libraries/tk/different-prefix-with-tcl.patch Normal file
View File

@ -0,0 +1,22 @@
--- tk8.5.15-orig/unix/Makefile.in 2014-01-25 08:57:45.626713122 +0800
+++ tk8.5.15/unix/Makefile.in 2014-01-25 08:59:35.315341825 +0800
@@ -995,7 +995,8 @@
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c
tkWindow.o: $(GENERIC_DIR)/tkWindow.c
- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c
+ $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
+ $(GENERIC_DIR)/tkWindow.c
tkButton.o: $(GENERIC_DIR)/tkButton.c
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c
--- tk8.5.15-orig/generic/tkWindow.c 2014-01-25 10:10:03.964476436 +0800
+++ tk8.5.15/generic/tkWindow.c 2014-01-25 10:08:06.020950933 +0800
@@ -983,6 +983,7 @@
Tcl_SetVar(interp, "tk_patchLevel", TK_PATCH_LEVEL, TCL_GLOBAL_ONLY);
Tcl_SetVar(interp, "tk_version", TK_VERSION, TCL_GLOBAL_ONLY);
+ Tcl_SetVar(interp, "tk_library", TK_LIBRARY, TCL_GLOBAL_ONLY);
tsdPtr->numMainWindows++;
return tkwin;