ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1919 from wkennington/master.st

Browse Source 
st: Add builtInput for pkgconfig
This commit is contained in:
Domen Kožar 2014-03-12 23:34:56 +01:00
commit 5b733c9e24
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/st/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, writeText, libX11, ncurses, libXext, libXft, fontconfig { stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft, fontconfig
, conf? null}: , conf? null}:
with stdenv.lib; with stdenv.lib;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
configFile = optionalString (conf!=null) (writeText "config.def.h" conf); configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
NIX_LDFLAGS = "-lfontconfig"; NIX_LDFLAGS = "-lfontconfig";