diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-07 13:45:47 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-07 13:46:07 +0100 |
| commit | 1c2439125147cdfb03108a5e2a925063dc64c486 (patch) | |
| tree | d3531bba084b5a962e488f3b02cdacc42e10ad89 /pkgs/tools | |
| parent | 88ca46bfa0dc0fbb2a50e392dcc2e3e69f2ae874 (diff) | |
| download | nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar.gz nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar.bz2 nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar.lz nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar.xz nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar.zst nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.zip | |
nix: Update to 1.2
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e433aa60579..e6f15b7a5e5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.1"; + name = "nix-1.2"; src = fetchurl { - url = "http://hydra.nixos.org/build/2860022/download/4/${name}.tar.bz2"; - sha256 = "edb2fc444eda49be144ca2901f1fc9472cd24896775ba02556ded5705863d324"; + url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; + sha256 = "2f7c2d27e240b6a43ebfba330127072e3fb1473c17dbfc5e9662ea589dfd16e5"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -27,8 +27,9 @@ stdenv.mkDerivation rec { configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl - --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl + --with-dbi=${perlPackages.DBI}/${perl.libPrefix} + --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} + --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc CFLAGS=-O3 CXXFLAGS=-O3 @@ -45,15 +46,16 @@ stdenv.mkDerivation rec { configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl - --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl + --with-dbi=${perlPackages.DBI}/${perl.libPrefix} + --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} + --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc CFLAGS=-O3 CXXFLAGS=-O3 '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system ) ''--with-system=${stdenv.cross.nix.system}''; - + doInstallCheck = false; }; |