From 0feb117c209baf1a77e90f922c7d1d98c708b2c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 12 Apr 2014 10:44:17 +0200 Subject: [PATCH] tk: attempt to fix build on darwin It complained about missing fontconfig symbols. Also fix some white-space. --- pkgs/development/libraries/tk/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix index c7fe3e105d8..2757a254385 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 = {