about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-08-02 22:10:42 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-08-02 22:10:42 +0000
commit4b42d5f7a9f7a7eda503bf66c6dee818d843cb10 (patch)
treebd83f37ad11d5fc348d9ce4cf79b6577abeeee5e /pkgs
parentaadea685af581ed07c366053e56825db5e628026 (diff)
downloadnixlib-4b42d5f7a9f7a7eda503bf66c6dee818d843cb10.tar
nixlib-4b42d5f7a9f7a7eda503bf66c6dee818d843cb10.tar.gz
nixlib-4b42d5f7a9f7a7eda503bf66c6dee818d843cb10.tar.bz2
nixlib-4b42d5f7a9f7a7eda503bf66c6dee818d843cb10.tar.lz
nixlib-4b42d5f7a9f7a7eda503bf66c6dee818d843cb10.tar.xz
nixlib-4b42d5f7a9f7a7eda503bf66c6dee818d843cb10.tar.zst
nixlib-4b42d5f7a9f7a7eda503bf66c6dee818d843cb10.zip
Fixing the openssl 1.0.0 cross build
svn path=/nixpkgs/trunk/; revision=22910
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/openssl/default.nix10
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 6dd579b98bee..e483af7206e5 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 = {