forked from mirrors/nixpkgs
nix: Update to 1.2
This commit is contained in:
parent
88ca46bfa0
commit
1c24391251
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
@ -8841,10 +8841,14 @@ let
|
|||
stateDir = config.nix.stateDir or "/nix/var";
|
||||
};
|
||||
|
||||
nixUnstable = nixStable;
|
||||
|
||||
/*
|
||||
nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
|
||||
storeDir = config.nix.storeDir or "/nix/store";
|
||||
stateDir = config.nix.stateDir or "/nix/var";
|
||||
};
|
||||
*/
|
||||
|
||||
nut = callPackage ../applications/misc/nut { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue