diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-11-30 18:32:23 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-11-30 18:32:23 +0000 |
| commit | f088bd47910299b3bfc43403d020516c23eef6cc (patch) | |
| tree | 000ff78e71cb1b045358339122f320f25a794741 | |
| parent | a772452fc9b0ca5cd87bd36b0a8807468bc2e910 (diff) | |
| download | nixpkgs-f088bd47910299b3bfc43403d020516c23eef6cc.tar nixpkgs-f088bd47910299b3bfc43403d020516c23eef6cc.tar.gz nixpkgs-f088bd47910299b3bfc43403d020516c23eef6cc.tar.bz2 nixpkgs-f088bd47910299b3bfc43403d020516c23eef6cc.tar.lz nixpkgs-f088bd47910299b3bfc43403d020516c23eef6cc.tar.xz nixpkgs-f088bd47910299b3bfc43403d020516c23eef6cc.tar.zst nixpkgs-f088bd47910299b3bfc43403d020516c23eef6cc.zip | |
* nixUnstable updated, now with garbage collector.
svn path=/nixpkgs/trunk/; revision=24943
| -rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index b5e56464eec..2dac26dd1b1 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -1,24 +1,26 @@ { stdenv, fetchurl, perl, curl, bzip2, openssl ? null +, pkgconfig, boehmgc , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-1.0pre24122"; + name = "nix-1.0pre24855"; src = fetchurl { - url = "http://hydra.nixos.org/build/667798/download/4/${name}.tar.bz2"; - sha256 = "0rz9radz4452bp3sy9yzcawn9yz5z4nyng43a0zrsa5v72cv695f"; + url = "http://hydra.nixos.org/build/774404/download/4/${name}.tar.bz2"; + sha256 = "cd2a75a04fc03dcafbab1d183e6ee485b491e17f1680bb7ee38738a2b1235932"; }; - buildNativeInputs = [ perl ]; - buildInputs = [ curl openssl ]; + buildNativeInputs = [ perl pkgconfig ]; + buildInputs = [ curl openssl boehmgc ]; configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} --with-bzip2=${bzip2} --disable-init-state + --enable-gc CFLAGS=-O3 CXXFLAGS=-O3 ''; |