Author: raskin
Date: Thu Feb 10 17:13:48 2011
New Revision: 25887
URL: https://svn.nixos.org/websvn/nix/?rev=25887&sc=1
Log:
Pass SQLite to nix-custom
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 Thu Feb 10
14:31:04 2011 (r25886)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/custom.nix Thu Feb 10
17:13:48 2011 (r25887)
@@ -12,6 +12,7 @@
, docbook5 ? null, docbook_xml_dtd_43 ? null
, boehmgc ? null
, pkgconfig ? null
+, sqlite ? null
, configureFlags ? []
, lib
, enableScripts ? []
@@ -35,6 +36,7 @@
++ (if w3m != null then [w3m] else [])
++ (if libxml2 != null then [libxml2] else [])
++ (if boehmgc != null then [boehmgc] else [])
+ ++ (if sqlite != null then [sqlite] else [])
++ (if pkgconfig != null then [pkgconfig] else [])
;
@@ -50,6 +52,7 @@
configureFlags = ''
--with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
+ --with-sqlite=${sqlite}
--disable-init-state
${toString configureFlags}
'';
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Feb 10 14:31:04
2011 (r25886)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Feb 10 17:13:48
2011 (r25887)
@@ -7468,7 +7468,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;
+ pkgconfig flex bison sqlite;
aterm = aterm25;
db4 = db45;
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
