From f5f32a5b4b2d199ee372e28f0b1debc36b90b699 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Aug 2010 15:21:42 +0000
Subject: [PATCH] * Nix 0.16.

svn path=/nixpkgs/trunk/; revision=23208
---
 pkgs/tools/package-management/nix/default.nix | 32 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 3138c0954e6..c75fa1ed60c 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,33 +1,43 @@
-{ stdenv, fetchurl, aterm, perl, curl, bzip2, openssl ? null
+{ stdenv, fetchurl, perl, curl, bzip2, openssl ? null
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.15";
-  
+  name = "nix-0.16";
+
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/326788/download/4/${name}.tar.bz2";
-    sha256 = "2d125e75dba387075a8bd443926d7fc6752e54cc9a21c2ef32e44fffc445a8ce";
+    url = "http://nixos.org/releases/nix/${name}/build/565033/download/4/${name}.tar.bz2";
+    sha256 = "0648ed285f263a2cc5a704c4aee70ec5f0415c3749f540c2691a2a613492c7c3";
   };
 
-  buildInputs = [ perl curl openssl ];
+  buildNativeInputs = [ perl ];
+  buildInputs = [ curl openssl ];
 
   configureFlags =
     ''
       --with-store-dir=${storeDir} --localstatedir=${stateDir}
-      --with-aterm=${aterm} --with-bzip2=${bzip2}
-      ${stdenv.lib.optionalString (openssl != null) "--with-openssl=${openssl}"}
+      --with-bzip2=${bzip2}
       --disable-init-state
+      CFLAGS=-O3 CXXFLAGS=-O3
     '';
 
-  doCheck = true;
+  crossAttrs = {
+    configureFlags =
+      ''
+        --with-store-dir=${storeDir} --localstatedir=${stateDir}
+        --with-bzip2=${bzip2.hostDrv}
+        --disable-init-state
+        CFLAGS=-O3 CXXFLAGS=-O3
+      '';
+    doCheck = false;
+  };
 
-  passthru = { inherit aterm; };
+  doCheck = true;
 
   meta = {
     description = "The Nix Deployment System";
     homepage = http://nixos.org/;
-    license = "LGPL";
+    license = "LGPLv2+";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9c9067a742..f92c7d9fd9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6853,7 +6853,7 @@ let
 
   mess = callPackage ../misc/emulators/mess { };
 
-  nix = nixUnstable;
+  nix = nixStable;
 
   nixStable = callPackage ../tools/package-management/nix {
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";