Author: raskin
Date: Mon May 2 08:29:01 2011
New Revision: 27084
URL: https://svn.nixos.org/websvn/nix/?rev=27084&sc=1
Log:
Update nixCustom for all the dependencies of latest SVN Nix
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 Mon May 2
07:26:47 2011 (r27083)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/custom.nix Mon May 2
08:29:01 2011 (r27084)
@@ -10,6 +10,7 @@
, libxml2 ? null
, docbook5_xsl ? null, libxslt ? null
, docbook5 ? null, docbook_xml_dtd_43 ? null
+, perlPackages
, boehmgc ? null
, pkgconfig ? null
, sqlite ? null
@@ -54,6 +55,8 @@
--with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
--with-sqlite=${sqlite}
--disable-init-state
+ --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
+ --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
${toString configureFlags}
'';
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 2 07:26:47
2011 (r27083)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 2 08:29:01
2011 (r27084)
@@ -7809,7 +7809,7 @@
import ../tools/package-management/nix/custom.nix {
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
autoconf libtool configureFlags enableScripts lib libxml2 boehmgc
- pkgconfig flex bison sqlite;
+ pkgconfig flex bison sqlite perlPackages;
aterm = aterm25;
db4 = db45;
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
