re-enabled darwin patch, gcc-darwin does not support -arch flag

svn path=/nixpkgs/trunk/; revision=21412
This commit is contained in:
Rob Vermaas
2010-04-29 08:19:13 +00:00
parent 8a79919093
commit 69bfabd328
2 changed files with 21 additions and 18 deletions
@@ -6,7 +6,7 @@ let
stdenv.cross;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation ( rec {
name = "openssl-0.9.8n";
src = fetchurl {
@@ -14,9 +14,6 @@ stdenv.mkDerivation rec {
sha256 = "008z1h09pa6dfxs4wgbqj5i1clw4v82b1waqvwanb1kb6wlbq6mh";
};
# I disable the patch temporarily, as it does not apply to 0.9.8n
# patches = [ ./darwin-arch.patch ];
buildNativeInputs = [ perl ];
configureScript = "./config";
@@ -39,4 +36,4 @@ stdenv.mkDerivation rec {
homepage = http://www.openssl.org/;
description = "A cryptographic library that implements the SSL and TLS protocols";
};
}
} // (if stdenv.isDarwin then { patches = [./darwin-arch.patch]; } else {}) )