From 375900a6e76debabe6b999d9fb7a2c95aff4488d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 27 Apr 2010 19:05:43 +0000 Subject: [PATCH] Add comment, use the patch for darwin svn path=/nixpkgs/trunk/; revision=21354 --- pkgs/development/libraries/openssl/darwin-arch.patch | 4 +--- pkgs/development/libraries/openssl/default.nix | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openssl/darwin-arch.patch b/pkgs/development/libraries/openssl/darwin-arch.patch index 8fae470313aa..db2ddbb815ec 100644 --- a/pkgs/development/libraries/openssl/darwin-arch.patch +++ b/pkgs/development/libraries/openssl/darwin-arch.patch @@ -1,6 +1,4 @@ -This patch was originally added by rob. -urkud have ported this patch to openssl-1.0.0 without diving into details (what -does it fix etc.) +The patch is specific to nix: MacOS gcc supports -arch. --- a/Configure +++ b/Configure @@ -549,9 +549,9 @@ my %table=( diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 53fc3c31d378..5c7fd37eb8e6 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,7 +6,7 @@ let stdenv.cross; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "openssl-1.0.0"; src = fetchurl { @@ -37,3 +37,9 @@ stdenv.mkDerivation rec { description = "A cryptographic library that implements the SSL and TLS protocols"; }; } +// +(if stdenv.isDarwin then { + patches = ./darwin-arch.patch; +} +else { }) +)