Author: viric
Date: Mon Aug 2 22:10:42 2010
New Revision: 22910
URL: https://svn.nixos.org/websvn/nix/?rev=22910&sc=1
Log:
Fixing the openssl 1.0.0 cross build
Modified:
nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix Mon Aug
2 21:47:28 2010 (r22909)
+++ nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix Mon Aug
2 22:10:42 2010 (r22910)
@@ -27,14 +27,10 @@
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 = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
