From bd61c42d223864e6582584f7ac1c5db0a3987150 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 30 Jun 2013 08:39:32 +1000 Subject: [PATCH] tk: fix build on darwin --- pkgs/development/libraries/tk/default.nix | 11 +++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix index 290580e5212..5cfd0d178eb 100644 --- a/pkgs/development/libraries/tk/default.nix +++ b/pkgs/development/libraries/tk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, x11 }: +{ stdenv, fetchurl, tcl, x11, libX11 }: stdenv.mkDerivation { name = "tk-8.5.7"; @@ -16,11 +16,18 @@ stdenv.mkDerivation { preConfigure = "cd unix"; - buildInputs = [tcl x11]; + buildInputs = [ tcl x11 libX11 ]; inherit tcl; passthru = { 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; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 543e28c08d2..e0318190777 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5376,7 +5376,9 @@ let 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 { };