Merging from trunk (the callPackage change)

svn path=/nixpkgs/branches/stdenv-updates/; revision=22915
2010-08-03 08:14:13 +00:00
parent 905963782b 50f2d32ce9
commit 6d15eabdc1
28 changed files with 2023 additions and 4907 deletions
--- 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 = {