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

tk: attempt to fix build on darwin

Browse Source 
It complained about missing fontconfig symbols.
Also fix some white-space.
This commit is contained in:
Vladimír Čunát 2014-04-12 10:44:17 +02:00
parent 7be0e37ca2
commit 0feb117c20
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,25 +1,26 @@
{ stdenv, fetchurl, pkgconfig, tcl, libXft }: { stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "tk-8.5.15"; name = "tk-8.5.15";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/tcl/tk8.5.15-src.tar.gz"; url = "mirror://sourceforge/tcl/tk8.5.15-src.tar.gz";
sha256 = "0grj0k0hljvwiz913pafqibz18fzk9xjxf0nzqrd9zdls036fp41"; sha256 = "0grj0k0hljvwiz913pafqibz18fzk9xjxf0nzqrd9zdls036fp41";
}; };
patches = [ ./different-prefix-with-tcl.patch ]; patches = [ ./different-prefix-with-tcl.patch ];
postInstall = '' postInstall = ''
ln -s $out/bin/wish* $out/bin/wish ln -s $out/bin/wish* $out/bin/wish
''; '';
configureFlags = "--with-tcl=${tcl}/lib"; configureFlags = "--with-tcl=${tcl}/lib";
preConfigure = "cd unix"; preConfigure = "cd unix";
buildInputs = [ pkgconfig tcl libXft ]; buildInputs = [ pkgconfig tcl libXft ]
++ stdenv.lib.optional stdenv.isDarwin fontconfig;
inherit tcl; inherit tcl;
passthru = { passthru = {