From 4192f35202e34c74462c62332c03c0dbc1092fa2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 13 Jun 2008 09:44:43 +0000 Subject: [PATCH] * unixODBCDrivers needs sqlite. svn path=/nixpkgs/trunk/; revision=12072 --- .../interpreters/python/2.5/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix index 0944f79618c5..bfbc421e1156 100644 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ b/pkgs/development/interpreters/python/2.5/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, - gdbmSupport ? true, gdbm ? null - , sqlite ? null - , db4 ? null - , readline ? null - , openssl ? null - }: +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 +, gdbmSupport ? true, gdbm ? null +, sqlite ? null +, db4 ? null +, readline ? null +, openssl ? null +}: assert zlibSupport -> zlib != null; assert gdbmSupport -> gdbm != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d25125668ccd..b410a6818e6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3346,7 +3346,7 @@ let pkgs = rec { unixODBCDrivers = recurseIntoAttrs (import ../development/libraries/unixODBCDrivers { inherit fetchurl stdenv unixODBC glibc libtool openssl zlib; - inherit postgresql mysql; + inherit postgresql mysql sqlite; }); wxGTK = wxGTK26;