diff options
| author | Song Wenwu <iyzsong@gmail.com> | 2014-01-13 20:08:20 +0800 |
|---|---|---|
| committer | Song Wenwu <iyzsong@gmail.com> | 2014-01-25 08:45:56 +0800 |
| commit | 81c6ff16dda0f3a959842a9b495cb0badda01983 (patch) | |
| tree | 3c319f31635151c43d13f1664a5209ab568c8b56 | |
| parent | 29a29c643878eadadec464537b2b07f7aab98b57 (diff) | |
| download | nixlib-81c6ff16dda0f3a959842a9b495cb0badda01983.tar nixlib-81c6ff16dda0f3a959842a9b495cb0badda01983.tar.gz nixlib-81c6ff16dda0f3a959842a9b495cb0badda01983.tar.bz2 nixlib-81c6ff16dda0f3a959842a9b495cb0badda01983.tar.lz nixlib-81c6ff16dda0f3a959842a9b495cb0badda01983.tar.xz nixlib-81c6ff16dda0f3a959842a9b495cb0badda01983.tar.zst nixlib-81c6ff16dda0f3a959842a9b495cb0badda01983.zip | |
tk: update to 8.5.15, enable xft support
| -rw-r--r-- | pkgs/development/libraries/tk/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix index a45c4217c7b6..7d55dd4c7d07 100644 --- a/pkgs/development/libraries/tk/default.nix +++ b/pkgs/development/libraries/tk/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, tcl, x11, libX11 }: +{ stdenv, fetchurl, pkgconfig, tcl, libXft }: 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"; }; postInstall = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation { preConfigure = "cd unix"; - buildInputs = [ tcl x11 libX11 ]; + buildInputs = [ pkgconfig tcl libXft ]; inherit tcl; @@ -27,6 +27,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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ee74ee90e1f..32cd77a4c369 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5621,9 +5621,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 { }; |