diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-11-19 10:39:48 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-11-19 10:39:48 +0000 |
commit | 165a3df7f5e8b1790b63d8b489cff6c7f844b2fd (patch) | |
tree | 9ee976ae171eee8a0ba2978856afba21e3c474a7 /pkgs/tools | |
parent | 63321806b4f0f4506637f006d85b69869c34fd91 (diff) | |
download | nixpkgs-165a3df7f5e8b1790b63d8b489cff6c7f844b2fd.tar nixpkgs-165a3df7f5e8b1790b63d8b489cff6c7f844b2fd.tar.gz nixpkgs-165a3df7f5e8b1790b63d8b489cff6c7f844b2fd.tar.bz2 nixpkgs-165a3df7f5e8b1790b63d8b489cff6c7f844b2fd.tar.lz nixpkgs-165a3df7f5e8b1790b63d8b489cff6c7f844b2fd.tar.xz nixpkgs-165a3df7f5e8b1790b63d8b489cff6c7f844b2fd.tar.zst nixpkgs-165a3df7f5e8b1790b63d8b489cff6c7f844b2fd.zip |
* Update nixSqlite.
svn path=/nixpkgs/trunk/; revision=24764
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/package-management/nix/sqlite.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index be9dfeec6c4..793fc57350a 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 ''; |