From e283f861746bdaba44e4f58478ba2a5b1e3257e4 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Wed, 19 May 2010 15:13:46 +0000
Subject: Making nixUnstable ready to cross build. That requires bzip2 to cross
 build properly, and this is done only in stdenv-updates.

svn path=/nixpkgs/trunk/; revision=21878
---
 pkgs/tools/package-management/nix/unstable.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 6e0f38f69c26..adcac62070e1 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -22,6 +22,17 @@ stdenv.mkDerivation rec {
       CFLAGS=-O3 CXXFLAGS=-O3
     '';
 
+  crossAttrs = {
+    configureFlags =
+      ''
+        --with-store-dir=${storeDir} --localstatedir=${stateDir}
+        --with-bzip2=${bzip2.hostDrv}
+        --disable-init-state
+        CFLAGS=-O3 CXXFLAGS=-O3
+      '';
+    doCheck = false;
+  };
+
   doCheck = true;
 
   meta = {
-- 
cgit 1.4.1