Author: raskin
Date: Sat Oct 30 12:01:02 2010
New Revision: 24541
URL: https://svn.nixos.org/websvn/nix/?rev=24541&sc=1
Log:
Nix trunk requires pkgconfig
Modified:
nixpkgs/trunk/pkgs/tools/package-management/nix/custom.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/custom.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/package-management/nix/custom.nix Sat Oct 30
11:21:06 2010 (r24540)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/custom.nix Sat Oct 30
12:01:02 2010 (r24541)
@@ -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 @@
++ (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 =
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Oct 30 11:21:06
2010 (r24540)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Oct 30 12:01:02
2010 (r24541)
@@ -7022,7 +7022,8 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
