pyrox.dev
lol
tk: 8.5.15 -> 8.6.4
+22
-19
+4
-4
pkgs/development/libraries/tk/default.nix
+4
-4
pkgs/development/libraries/tk/default.nix
···
1
1
{ stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }:
2
2
3
3
stdenv.mkDerivation {
4
-
name = "tk-8.5.15";
4
+
name = "tk-8.6.4";
5
5
6
6
src = fetchurl {
7
-
url = "mirror://sourceforge/tcl/tk8.5.15-src.tar.gz";
8
-
sha256 = "0grj0k0hljvwiz913pafqibz18fzk9xjxf0nzqrd9zdls036fp41";
7
+
url = "mirror://sourceforge/tcl/tk8.6.4-src.tar.gz";
8
+
sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
9
9
};
10
10
11
11
patches = [ ./different-prefix-with-tcl.patch ];
···
26
26
inherit tcl;
27
27
28
28
passthru = {
29
-
libPrefix = "tk8.5";
29
+
libPrefix = "tk8.6";
30
30
};
31
31
32
32
meta = {
+18
-15
pkgs/development/libraries/tk/different-prefix-with-tcl.patch
+18
-15
pkgs/development/libraries/tk/different-prefix-with-tcl.patch
···
1
-
--- tk8.5.15-orig/unix/Makefile.in 2014-01-25 08:57:45.626713122 +0800
2
-
+++ tk8.5.15/unix/Makefile.in 2014-01-25 08:59:35.315341825 +0800
3
-
@@ -995,7 +995,8 @@
1
+
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
2
+
index b5cbbab..96b5501 100644
3
+
--- a/generic/tkWindow.c
4
+
+++ b/generic/tkWindow.c
5
+
@@ -988,6 +988,7 @@ TkCreateMainWindow(
6
+
7
+
Tcl_SetVar2(interp, "tk_patchLevel", NULL, TK_PATCH_LEVEL, TCL_GLOBAL_ONLY);
8
+
Tcl_SetVar2(interp, "tk_version", NULL, TK_VERSION, TCL_GLOBAL_ONLY);
9
+
+ Tcl_SetVar2(interp, "tk_library", NULL, TK_LIBRARY, TCL_GLOBAL_ONLY);
10
+
11
+
tsdPtr->numMainWindows++;
12
+
return tkwin;
13
+
diff --git a/unix/Makefile.in b/unix/Makefile.in
14
+
index f21fdbb..c61b0df 100644
15
+
--- a/unix/Makefile.in
16
+
+++ b/unix/Makefile.in
17
+
@@ -1029,7 +1029,7 @@ tkVisual.o: $(GENERIC_DIR)/tkVisual.c
4
18
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c
5
19
6
20
tkWindow.o: $(GENERIC_DIR)/tkWindow.c
7
21
- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c
8
-
+ $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
9
-
+ $(GENERIC_DIR)/tkWindow.c
22
+
+ $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" $(GENERIC_DIR)/tkWindow.c
10
23
11
24
tkButton.o: $(GENERIC_DIR)/tkButton.c
12
25
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c
13
-
--- tk8.5.15-orig/generic/tkWindow.c 2014-01-25 10:10:03.964476436 +0800
14
-
+++ tk8.5.15/generic/tkWindow.c 2014-01-25 10:08:06.020950933 +0800
15
-
@@ -983,6 +983,7 @@
16
-
17
-
Tcl_SetVar(interp, "tk_patchLevel", TK_PATCH_LEVEL, TCL_GLOBAL_ONLY);
18
-
Tcl_SetVar(interp, "tk_version", TK_VERSION, TCL_GLOBAL_ONLY);
19
-
+ Tcl_SetVar(interp, "tk_library", TK_LIBRARY, TCL_GLOBAL_ONLY);
20
-
21
-
tsdPtr->numMainWindows++;
22
-
return tkwin;