nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update nixUnstable

Browse Source
This commit is contained in:
Eelco Dolstra 2013-01-20 17:25:09 +01:00
parent 9da086c08d
commit bcc0c1dc59
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/package-management/nix/unstable.nix
View File

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "nix-1.2pre2980_9de6bc5";
name = "nix-1.4pre3044_536c85e";
src = fetchurl {
url = "http://hydra.nixos.org/build/3338447/download/4/${name}.tar.bz2";
sha256 = "b767c2b75a0036edfc6be209dcaab23643887b192e3788640380ac27298b08d0";
url = "http://hydra.nixos.org/build/3794557/download/5/${name}.tar.xz";
sha256 = "d0f952ff3b4c0cf7f9682b45844ffb3686ff333d02be83341380186a97834f95";
};
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 = {

4
pkgs/top-level/all-packages.nix
View File

@ -8978,14 +8978,10 @@ 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 { };