diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-12 16:54:35 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-12 16:54:35 +0000 |
commit | eda3fd1730cdfe7302ad8891fca7bb09670e37b2 (patch) | |
tree | 7ca3e75279c237cb10ee9b365b0bc919a5f2eddc /pkgs/tools/package-management | |
parent | 5de58eb38778eef03e119545b21b2ad48c125482 (diff) | |
parent | b0834a993ea0daa1a417d7d838764c828cee992c (diff) |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 1483120e40968..3048705566939 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre30070"; + name = "nix-1.0pre30706"; src = fetchurl { - url = "http://hydra.nixos.org/build/1480955/download/4/${name}.tar.bz2"; - sha256 = "71335de404ec6745418b524622527b470485fb968bf7cf10a0cb67926ee1286a"; + url = "http://hydra.nixos.org/build/1580753/download/4/${name}.tar.bz2"; + sha256 = "2658a4fea95799d8719685a808ab354f0b5a3ce38af92117e1a15c394c261c5b"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -31,9 +31,14 @@ stdenv.mkDerivation rec { '' --with-store-dir=${storeDir} --localstatedir=${stateDir} --with-bzip2=${bzip2.hostDrv} --with-sqlite=${sqlite.hostDrv} + --enable-gc + --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl + --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl --disable-init-state CFLAGS=-O3 CXXFLAGS=-O3 - ''; + '' + stdenv.lib.optionalString ( + stdenv.cross ? nix && stdenv.cross.nix ? system + ) ''--with-system=${stdenv.cross.nix.system}''; doCheck = false; }; |