diff options
-rw-r--r-- | pkgs/development/interpreters/tcl/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/tk/default.nix | 26 | ||||
-rw-r--r-- | pkgs/development/libraries/tk/different-prefix-with-tcl.patch | 22 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 43 insertions, 17 deletions
diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix index 48755065b992..c9a0fd7546fa 100644 --- a/pkgs/development/interpreters/tcl/default.nix +++ b/pkgs/development/interpreters/tcl/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { - name = "tcl-8.5.7"; + name = "tcl-8.5.15"; src = fetchurl { - url = mirror://sourceforge/tcl/tcl8.5.7-src.tar.gz; - sha256 = "1wk67qq12bdbaqsi6cxwj6ra8nc8ph1na9rh808kfk6hm18qvlk7"; + url = mirror://sourceforge/tcl/tcl8.5.15-src.tar.gz; + sha256 = "0kl8lbfwy4v4q4461wjmva95h0pgiprykislpw4nnpkrc7jalkpj"; }; preConfigure = "cd unix"; diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix index a45c4217c7b6..fd3684d189c8 100644 --- a/pkgs/development/libraries/tk/default.nix +++ b/pkgs/development/libraries/tk/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, tcl, x11, libX11 }: +{ stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }: stdenv.mkDerivation { - name = "tk-8.5.7"; - + name = "tk-8.5.15"; + src = fetchurl { - url = "mirror://sourceforge/tcl/tk8.5.7-src.tar.gz"; - sha256 = "0c5gsy3nlwl0wn9swz4k4v7phy7nzjl317gca1jykgf4jz9nwdnr"; + url = "mirror://sourceforge/tcl/tk8.5.15-src.tar.gz"; + sha256 = "0grj0k0hljvwiz913pafqibz18fzk9xjxf0nzqrd9zdls036fp41"; }; - + + patches = [ ./different-prefix-with-tcl.patch ]; + postInstall = '' ln -s $out/bin/wish* $out/bin/wish ''; - + configureFlags = "--with-tcl=${tcl}/lib"; - + preConfigure = "cd unix"; - buildInputs = [ tcl x11 libX11 ]; - + buildInputs = [ pkgconfig tcl libXft ] + ++ stdenv.lib.optional stdenv.isDarwin fontconfig; + + NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null; + inherit tcl; passthru = { @@ -27,6 +32,7 @@ stdenv.mkDerivation { meta = { description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; homepage = http://www.tcl.tk/; + license = stdenv.lib.licenses.tcltk; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/tk/different-prefix-with-tcl.patch b/pkgs/development/libraries/tk/different-prefix-with-tcl.patch new file mode 100644 index 000000000000..bf331b75cae0 --- /dev/null +++ b/pkgs/development/libraries/tk/different-prefix-with-tcl.patch @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0017963dc085..63c2e6a6cd8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6053,9 +6053,7 @@ let tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; - tk = callPackage ../development/libraries/tk { - libX11 = xlibs.libX11; - }; + tk = callPackage ../development/libraries/tk { }; tnt = callPackage ../development/libraries/tnt { }; |