public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tk: fix build on darwin

Browse Source
This commit is contained in:
Jason \"Don\" O'Conal 2013-06-30 08:39:32 +10:00 committed by Rok Garbas
parent dff980733a
commit bd61c42d22
2 changed files with 12 additions and 3 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,4 +1,4 @@
{ stdenv, fetchurl, tcl, x11 }: { stdenv, fetchurl, tcl, x11, libX11 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "tk-8.5.7"; name = "tk-8.5.7";
@ -16,11 +16,18 @@ stdenv.mkDerivation {
preConfigure = "cd unix"; preConfigure = "cd unix";
buildInputs = [tcl x11]; buildInputs = [ tcl x11 libX11 ];
inherit tcl; inherit tcl;
passthru = { passthru = {
libPrefix = "tk8.5"; libPrefix = "tk8.5";
}; };
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/;
maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
platforms = stdenv.lib.platforms.all;
};
} }

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

@ -5376,7 +5376,9 @@ let
tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
tk = callPackage ../development/libraries/tk { }; tk = callPackage ../development/libraries/tk {
libX11 = xlibs.libX11;
};
tnt = callPackage ../development/libraries/tnt { }; tnt = callPackage ../development/libraries/tnt { };