mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Add comment, use the patch for darwin
svn path=/nixpkgs/trunk/; revision=21354
This commit is contained in:
parent
ae8d4501b6
commit
375900a6e7
2 changed files with 8 additions and 4 deletions
|
@ -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=(
|
||||
|
|
|
@ -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 { })
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue