diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-05 18:57:33 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-05 18:57:33 +0100 |
| commit | e2d6154fff01d61f8338487d2836bd1d1d1fd74c (patch) | |
| tree | aa1fd07cf1937e056a4d1814109441f130a9331e /pkgs/tools/package-management | |
| parent | 846c1f58de8065b494bbabca94611ad0dd8c8fc7 (diff) | |
| download | nixlib-e2d6154fff01d61f8338487d2836bd1d1d1fd74c.tar nixlib-e2d6154fff01d61f8338487d2836bd1d1d1fd74c.tar.gz nixlib-e2d6154fff01d61f8338487d2836bd1d1d1fd74c.tar.bz2 nixlib-e2d6154fff01d61f8338487d2836bd1d1d1fd74c.tar.lz nixlib-e2d6154fff01d61f8338487d2836bd1d1d1fd74c.tar.xz nixlib-e2d6154fff01d61f8338487d2836bd1d1d1fd74c.tar.zst nixlib-e2d6154fff01d61f8338487d2836bd1d1d1fd74c.zip | |
nix: Update to 1.3
Also, use /etc/nix as the default configuration directory. This way $NIX_CONF_DIR no longer needs to be set in most cases.
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e6f15b7a5e5d..5448c9f5ba38 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.2"; + name = "nix-1.3"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "2f7c2d27e240b6a43ebfba330127072e3fb1473c17dbfc5e9662ea589dfd16e5"; + sha256 = "32cba96df0e02d6627f5625a441fdd4ea0db718dd5bfd50044cdfd3c606d4852"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = '' - --with-store-dir=${storeDir} --localstatedir=${stateDir} + --with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc --with-dbi=${perlPackages.DBI}/${perl.libPrefix} --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { CFLAGS=-O3 CXXFLAGS=-O3 ''; + makeFlags = "profiledir=$(out)/etc/profile.d"; + + installFlags = "sysconfdir=$(out)/etc"; + doInstallCheck = true; crossAttrs = { |