From 3827d28f27392f47a13e0cdaf24b209369bd31a9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 2 May 2011 08:29:01 +0000 Subject: [PATCH] Update nixCustom for all the dependencies of latest SVN Nix svn path=/nixpkgs/trunk/; revision=27084 --- pkgs/tools/package-management/nix/custom.nix | 3 +++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/custom.nix b/pkgs/tools/package-management/nix/custom.nix index 069d82979ab..6a73c0e9528 100644 --- a/pkgs/tools/package-management/nix/custom.nix +++ b/pkgs/tools/package-management/nix/custom.nix @@ -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 @@ stdenv.mkDerivation { --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} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0513256e47a..326f6cea878 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7809,7 +7809,7 @@ let 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;