public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update nixCustom for all the dependencies of latest SVN Nix

Browse Source 
svn path=/nixpkgs/trunk/; revision=27084
This commit is contained in:
Michael Raskin 2011-05-02 08:29:01 +00:00
parent f28be20395
commit 3827d28f27
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@
, libxml2 ? null , libxml2 ? null
, docbook5_xsl ? null, libxslt ? null , docbook5_xsl ? null, libxslt ? null
, docbook5 ? null, docbook_xml_dtd_43 ? null , docbook5 ? null, docbook_xml_dtd_43 ? null
, perlPackages
, boehmgc ? null , boehmgc ? null
, pkgconfig ? null , pkgconfig ? null
, sqlite ? null , sqlite ? null
@ -54,6 +55,8 @@ stdenv.mkDerivation {
--with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2} --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
--with-sqlite=${sqlite} --with-sqlite=${sqlite}
--disable-init-state --disable-init-state
--with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
--with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
${toString configureFlags} ${toString configureFlags}
''; '';

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

@ -7809,7 +7809,7 @@ let
import ../tools/package-management/nix/custom.nix { import ../tools/package-management/nix/custom.nix {
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
autoconf libtool configureFlags enableScripts lib libxml2 boehmgc autoconf libtool configureFlags enableScripts lib libxml2 boehmgc
pkgconfig flex bison sqlite; pkgconfig flex bison sqlite perlPackages;
aterm = aterm25; aterm = aterm25;
db4 = db45; db4 = db45;
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m; inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;