From 4b42d5f7a9f7a7eda503bf66c6dee818d843cb10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 2 Aug 2010 22:10:42 +0000
Subject: [PATCH] Fixing the openssl 1.0.0 cross build

svn path=/nixpkgs/trunk/; revision=22910
---
 pkgs/development/libraries/openssl/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 6dd579b98be..e483af7206e 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -27,14 +27,10 @@ stdenv.mkDerivation rec {
 
   crossAttrs = {
     preConfigure=''
-      export cross=$crossSystem-
-    '';
-    configureFlags="--libdir=lib ${opensslCrossSystem} shared";
-    buildPhase = ''
-      make CC=$crossConfig-gcc \
-        AR="$crossConfig-ar r" \
-        RANLIB=$crossConfig-ranlib
+      # It's configure does not like --build or --host
+      export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
     '';
+    configureScript = "./Configure";
   };
 
   meta = {