From 9a9d97642a061801249f921890b9cbee50dc2bbf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 10 Feb 2011 17:13:48 +0000 Subject: [PATCH] Pass SQLite to nix-custom svn path=/nixpkgs/trunk/; revision=25887 --- 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 a84718e7b4a..069d82979ab 100644 --- a/pkgs/tools/package-management/nix/custom.nix +++ b/pkgs/tools/package-management/nix/custom.nix @@ -12,6 +12,7 @@ , docbook5 ? null, docbook_xml_dtd_43 ? null , boehmgc ? null , pkgconfig ? null +, sqlite ? null , configureFlags ? [] , lib , enableScripts ? [] @@ -35,6 +36,7 @@ stdenv.mkDerivation { ++ (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 @@ stdenv.mkDerivation { configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2} + --with-sqlite=${sqlite} --disable-init-state ${toString configureFlags} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49ef84cbf85..30574466f61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7468,7 +7468,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; + pkgconfig flex bison sqlite; aterm = aterm25; db4 = db45; inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;