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

* Use Nix with SQLite in NixOS by default. Cross fingers.

Browse source 
svn path=/nixpkgs/trunk/; revision=25898
This commit is contained in:
Eelco Dolstra 2011-02-11 12:45:19 +00:00
parent dd3d477d74
commit 6ca6fd8fc6
3 changed files with 8 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,32 +0,0 @@
{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
, pkgconfig, boehmgc
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
}:
stdenv.mkDerivation rec {
name = "nix-1.0pre25179";
src = fetchurl {
url = "http://hydra.nixos.org/build/811883/download/4/${name}.tar.bz2";
sha256 = "4a6f7ca69428d24f253f8f199589d25fca1e7146a6591288392423634e3303f7";
};
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
'';
doCheck = true;
meta = {
description = "The Nix Deployment System";
homepage = http://nixos.org/;
license = "LGPLv2+";
};
}

12
pkgs/tools/package-management/nix/unstable.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, perl, curl, bzip2, openssl ? null
{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
, pkgconfig, boehmgc
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
}:
stdenv.mkDerivation rec {
name = "nix-1.0pre24855";
name = "nix-1.0pre25886";
src = fetchurl {
url = "http://hydra.nixos.org/build/774404/download/4/${name}.tar.bz2";
sha256 = "cd2a75a04fc03dcafbab1d183e6ee485b491e17f1680bb7ee38738a2b1235932";
url = "http://hydra.nixos.org/build/894162/download/4/${name}.tar.bz2";
sha256 = "4513a6a42f485bed692ba2d34214383496f59064b9eb5d5ecec739dda703ddb3";
};
buildNativeInputs = [ perl pkgconfig ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configureFlags =
''
--with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-bzip2=${bzip2}
--with-bzip2=${bzip2} --with-sqlite=${sqlite}
--disable-init-state
--enable-gc
CFLAGS=-O3 CXXFLAGS=-O3
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
configureFlags =
''
--with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-bzip2=${bzip2.hostDrv}
--with-bzip2=${bzip2.hostDrv} --with-sqlite=${sqlite.hostDrv}
--disable-init-state
CFLAGS=-O3 CXXFLAGS=-O3
'';

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

@ -785,7 +785,7 @@ let
httpfs2 = callPackage ../tools/filesystems/httpfs { };
hydra = callPackage ../development/tools/misc/hydra {
nix = nixSqlite ;
nix = nixSqlite;
};
iasl = callPackage ../development/compilers/iasl { };
@ -7471,11 +7471,7 @@ let
stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
};
# The SQLite branch.
nixSqlite = lowPrio (callPackage ../tools/package-management/nix/sqlite.nix {
storeDir = getConfig [ "nix" "storeDir" ] "/nix/store";
stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
});
nixSqlite = nixUnstable;
nixCustomFun = src: preConfigure: enableScripts: configureFlags:
import ../tools/package-management/nix/custom.nix {