diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2010-10-30 12:01:02 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2010-10-30 12:01:02 +0000 |
| commit | 9a6c3e6fe963c8d04734afef19a56e46300cb910 (patch) | |
| tree | dbb6505347c19d7758697661d920a830b2f20238 /pkgs | |
| parent | 9af1c42473d3fe471b2f1bfc7e07e2991f2a7ba1 (diff) | |
| download | nixlib-9a6c3e6fe963c8d04734afef19a56e46300cb910.tar nixlib-9a6c3e6fe963c8d04734afef19a56e46300cb910.tar.gz nixlib-9a6c3e6fe963c8d04734afef19a56e46300cb910.tar.bz2 nixlib-9a6c3e6fe963c8d04734afef19a56e46300cb910.tar.lz nixlib-9a6c3e6fe963c8d04734afef19a56e46300cb910.tar.xz nixlib-9a6c3e6fe963c8d04734afef19a56e46300cb910.tar.zst nixlib-9a6c3e6fe963c8d04734afef19a56e46300cb910.zip | |
Nix trunk requires pkgconfig
svn path=/nixpkgs/trunk/; revision=24541
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/package-management/nix/custom.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/custom.nix b/pkgs/tools/package-management/nix/custom.nix index 2c9f0bbe9738..a84718e7b4aa 100644 --- a/pkgs/tools/package-management/nix/custom.nix +++ b/pkgs/tools/package-management/nix/custom.nix @@ -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 = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 779369cee78c..7749d816c55e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |