diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index be9dfeec6c4f..793fc57350a3 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null +, pkgconfig, boehmgc , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-1.0pre23559"; + name = "nix-1.0pre24749"; src = fetchurl { - url = "http://hydra.nixos.org/build/614186/download/4/${name}.tar.bz2"; - sha256 = "5c7fd783effc9c570f6feb5631f94e369a37de6b4fb2f51459964e48c465dcfa"; + url = "http://hydra.nixos.org/build/757682/download/4/${name}.tar.bz2"; + sha256 = "ab2bda296eb91a600d01a22ed4096acdf9b5d613f1155f98433d87e273a58970"; }; - buildInputs = [ perl curl openssl ]; + buildInputs = [ perl curl openssl pkgconfig boehmgc ]; configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} --with-bzip2=${bzip2} --with-sqlite=${sqlite} --disable-init-state + --enable-gc CFLAGS=-O3 CXXFLAGS=-O3 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c8449049f64..df5a441a50ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7070,8 +7070,7 @@ let }; # The SQLite branch. - nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) { - inherit fetchurl stdenv perl curl bzip2 openssl sqlite; + nixSqlite = lowPrio (callPackage ../tools/package-management/nix/sqlite.nix { storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; });