swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Update nixSqlite.

Browse source 
svn path=/nixpkgs/trunk/; revision=24764
This commit is contained in:
Eelco Dolstra 2010-11-19 10:39:48 +00:00
parent 63321806b4
commit 165a3df7f5
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/package-management/nix/sqlite.nix
View file

@ -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
'';

3
pkgs/top-level/all-packages.nix
View file

@ -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";
});