diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-29 14:01:38 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-29 14:01:38 -0700 |
| commit | 6d0bfb1b198902dbeacd5e10bfd042084375594c (patch) | |
| tree | 18aa0f0751e7f3d55346cd5fbdec381fd144c647 /pkgs/development | |
| parent | 7a77553d97d5ed477daf8b2729743f392f3fe167 (diff) | |
tk: 8.5.15 -> 8.6.4
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/tk/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/tk/different-prefix-with-tcl.patch | 33 |
2 files changed, 22 insertions, 19 deletions
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix index fd3684d189c83..e44514d5abf1b 100644 --- a/pkgs/development/libraries/tk/default.nix +++ b/pkgs/development/libraries/tk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }: stdenv.mkDerivation { - name = "tk-8.5.15"; + name = "tk-8.6.4"; src = fetchurl { - url = "mirror://sourceforge/tcl/tk8.5.15-src.tar.gz"; - sha256 = "0grj0k0hljvwiz913pafqibz18fzk9xjxf0nzqrd9zdls036fp41"; + url = "mirror://sourceforge/tcl/tk8.6.4-src.tar.gz"; + sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88"; }; patches = [ ./different-prefix-with-tcl.patch ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation { inherit tcl; passthru = { - libPrefix = "tk8.5"; + libPrefix = "tk8.6"; }; meta = { diff --git a/pkgs/development/libraries/tk/different-prefix-with-tcl.patch b/pkgs/development/libraries/tk/different-prefix-with-tcl.patch index bf331b75cae07..aee46e149b1ac 100644 --- a/pkgs/development/libraries/tk/different-prefix-with-tcl.patch +++ b/pkgs/development/libraries/tk/different-prefix-with-tcl.patch @@ -1,22 +1,25 @@ ---- 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 @@ +diff --git a/generic/tkWindow.c b/generic/tkWindow.c +index b5cbbab..96b5501 100644 +--- a/generic/tkWindow.c ++++ b/generic/tkWindow.c +@@ -988,6 +988,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 f21fdbb..c61b0df 100644 +--- a/unix/Makefile.in ++++ b/unix/Makefile.in +@@ -1029,7 +1029,7 @@ tkVisual.o: $(GENERIC_DIR)/tkVisual.c $(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 ++ $(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; |