diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-04-12 10:44:17 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-04-12 10:44:17 +0200 |
| commit | 0feb117c209baf1a77e90f922c7d1d98c708b2c7 (patch) | |
| tree | 0fa4639a33caa3a7339e3d71726838aa438ce880 /pkgs/development/libraries/tk | |
| parent | 7be0e37ca2dc8fa6b079baa6e272e3decb011b76 (diff) | |
tk: attempt to fix build on darwin
It complained about missing fontconfig symbols. Also fix some white-space.
Diffstat (limited to 'pkgs/development/libraries/tk')
| -rw-r--r-- | pkgs/development/libraries/tk/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix index c7fe3e105d88a..2757a2543859a 100644 --- a/pkgs/development/libraries/tk/default.nix +++ b/pkgs/development/libraries/tk/default.nix @@ -1,25 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, tcl, libXft }: +{ stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }: stdenv.mkDerivation { name = "tk-8.5.15"; - + src = fetchurl { 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 = [ pkgconfig tcl libXft ]; - + buildInputs = [ pkgconfig tcl libXft ] + ++ stdenv.lib.optional stdenv.isDarwin fontconfig; + inherit tcl; passthru = { |