diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-04-27 19:05:43 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-04-27 19:05:43 +0000 |
| commit | 375900a6e76debabe6b999d9fb7a2c95aff4488d (patch) | |
| tree | 3db8d48c1ae28d93c533da6ffe99b5d010e3a53c /pkgs/development/libraries/openssl | |
| parent | ae8d4501b65ad6be7d83b3da60672c39e1b8ffcb (diff) | |
| download | nixpkgs-375900a6e76debabe6b999d9fb7a2c95aff4488d.tar nixpkgs-375900a6e76debabe6b999d9fb7a2c95aff4488d.tar.gz nixpkgs-375900a6e76debabe6b999d9fb7a2c95aff4488d.tar.bz2 nixpkgs-375900a6e76debabe6b999d9fb7a2c95aff4488d.tar.lz nixpkgs-375900a6e76debabe6b999d9fb7a2c95aff4488d.tar.xz nixpkgs-375900a6e76debabe6b999d9fb7a2c95aff4488d.tar.zst nixpkgs-375900a6e76debabe6b999d9fb7a2c95aff4488d.zip | |
Add comment, use the patch for darwin
svn path=/nixpkgs/trunk/; revision=21354
Diffstat (limited to 'pkgs/development/libraries/openssl')
| -rw-r--r-- | pkgs/development/libraries/openssl/darwin-arch.patch | 4 | ||||
| -rw-r--r-- | 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 8fae470313a..db2ddbb815e 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 53fc3c31d37..5c7fd37eb8e 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 { }) +) |