ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

tk: update to 8.5.15, enable xft support

Browse Source
This commit is contained in:
Song Wenwu 2014-01-13 20:08:20 +08:00
parent 29a29c6438
commit 81c6ff16dd
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
};

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };