MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #16358 from timbertson/tk

Browse source 
tk: propagate dependency on tcl & libXft
This commit is contained in:
Frederik Rietdijk 2016-07-18 23:11:53 +02:00 committed by GitHub
commit e558561c3e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/tk/generic.nix
View file

@ -17,9 +17,11 @@ stdenv.mkDerivation {
"--with-tcl=${tcl}/lib" "--with-tcl=${tcl}/lib"
]; ];
buildInputs = [ pkgconfig tcl libXft ] buildInputs = [ pkgconfig ]
++ stdenv.lib.optional stdenv.isDarwin fontconfig; ++ stdenv.lib.optional stdenv.isDarwin fontconfig;
propagatedBuildInputs = [ tcl libXft ];
NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null; NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null;
inherit tcl; inherit tcl;