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

Nix trunk requires pkgconfig

Browse Source 
svn path=/nixpkgs/trunk/; revision=24541
This commit is contained in:
Michael Raskin 2010-10-30 12:01:02 +00:00
parent 9af1c42473
commit 9a6c3e6fe9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/package-management/nix/custom.nix
View File

@ -11,6 +11,7 @@
, docbook5_xsl ? null, libxslt ? null
, docbook5 ? null, docbook_xml_dtd_43 ? null
, boehmgc ? null
, pkgconfig ? null
, configureFlags ? []
, lib
, enableScripts ? []
@ -34,6 +35,7 @@ stdenv.mkDerivation {
++ (if w3m != null then [w3m] else [])
++ (if libxml2 != null then [libxml2] else [])
++ (if boehmgc != null then [boehmgc] else [])
++ (if pkgconfig != null then [pkgconfig] else [])
;
preConfigure =

3
pkgs/top-level/all-packages.nix
View File

@ -7022,7 +7022,8 @@ let
nixCustomFun = src: preConfigure: enableScripts: configureFlags:
import ../tools/package-management/nix/custom.nix {
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
autoconf libtool configureFlags enableScripts lib bison libxml2 boehmgc;
autoconf libtool configureFlags enableScripts lib bison libxml2 boehmgc
pkgconfig;
flex = flex2533;
aterm = aterm25;
db4 = db45;