forked from mirrors/nixpkgs
* Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=26851
This commit is contained in:
parent
3a67579267
commit
03ef305478
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
|
||||
, pkgconfig, boehmgc
|
||||
, pkgconfig, boehmgc, perlPackages
|
||||
, storeDir ? "/nix/store"
|
||||
, stateDir ? "/nix/var"
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nix-1.0pre26015";
|
||||
name = "nix-1.0pre26784";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hydra.nixos.org/build/920246/download/4/${name}.tar.bz2";
|
||||
sha256 = "d2c9caa8573689de4e95eecaf9829d4b672ea3cb9bdfa825dac0ab0dbffb3c70";
|
||||
url = "http://hydra.nixos.org/build/1041231/download/4/${name}.tar.bz2";
|
||||
sha256 = "33711d31b25b99f0ee06ad093332f71b2be5abdbb52d5eed77c42d7e24ad3765";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ perl pkgconfig ];
|
||||
|
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
|
|||
''
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
||||
--with-bzip2=${bzip2} --with-sqlite=${sqlite}
|
||||
--with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
|
||||
--with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
|
||||
--disable-init-state
|
||||
--enable-gc
|
||||
CFLAGS=-O3 CXXFLAGS=-O3
|
||||
|
@ -35,6 +37,8 @@ stdenv.mkDerivation rec {
|
|||
doCheck = false;
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
|
|
Loading…
Reference in a new issue