Author: eelco
Date: Fri Jul 30 13:05:52 2010
New Revision: 22826
URL: https://svn.nixos.org/websvn/nix/?rev=22826&sc=1
Log:
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 30 12:31:10
2010 (r22825)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 30 13:05:52
2010 (r22826)
@@ -5433,12 +5433,14 @@
inherit fetchurl stdenv libogg;
};
- sqlite = import ../development/libraries/sqlite {
+ sqlite = makeOverridable (import ../development/libraries/sqlite) {
inherit fetchurl stdenv;
+ readline = null;
+ ncurses = null;
};
- sqliteInteractive = lowPrio (appendToName "interactive" (import
../development/libraries/sqlite {
- inherit fetchurl stdenv readline ncurses;
+ sqliteInteractive = lowPrio (appendToName "interactive" (sqlite.override {
+ inherit readline ncurses;
}));
stlport = import ../development/libraries/stlport {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
