diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-03 08:14:13 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-03 08:14:13 +0000 |
| commit | 6d15eabdc19020727c60fbcc4712cff6b74ae6dc (patch) | |
| tree | 32df5f922b3d9d947785a6330e1d45344e344a30 /pkgs/development/libraries/openssl | |
| parent | 905963782b82668908799fd0c156b1e070582fba (diff) | |
| parent | 50f2d32ce9311dc251d27f4509af45e1e83e4156 (diff) | |
| download | nixlib-6d15eabdc19020727c60fbcc4712cff6b74ae6dc.tar nixlib-6d15eabdc19020727c60fbcc4712cff6b74ae6dc.tar.gz nixlib-6d15eabdc19020727c60fbcc4712cff6b74ae6dc.tar.bz2 nixlib-6d15eabdc19020727c60fbcc4712cff6b74ae6dc.tar.lz nixlib-6d15eabdc19020727c60fbcc4712cff6b74ae6dc.tar.xz nixlib-6d15eabdc19020727c60fbcc4712cff6b74ae6dc.tar.zst nixlib-6d15eabdc19020727c60fbcc4712cff6b74ae6dc.zip | |
Merging from trunk (the callPackage change)
svn path=/nixpkgs/branches/stdenv-updates/; revision=22915
Diffstat (limited to 'pkgs/development/libraries/openssl')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 10 |
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 = { |