public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgcrypt: fix 1.5 build on macOS (#59507)

Browse Source 
libgcrypt-1.5's configure script incorrectly detects x86_64-apple-darwin
(macOS) as an ELF platform. This causes failures when compiling assembly
sources. Backport libgcrypt's fix for this issue, fixing libgcrypt-1.5's
build on macOS.
This commit is contained in:
strager 2019-05-03 11:14:18 -07:00 committed by Dmitry Kalinkin
parent a602026454
commit 21112a7c16
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libgcrypt/1.5.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: { lib, stdenv, fetchpatch, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
assert enableCapabilities -> stdenv.isLinux; assert enableCapabilities -> stdenv.isLinux;
@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h"; sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h";
}; };
patches = stdenv.lib.optionals stdenv.isDarwin [
(fetchpatch {
name = "fix-x86_64-apple-darwin.patch";
sha256 = "138sfwl1avpy19320dbd63mskspc1khlc93j1f1zmylxx3w19csi";
url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=71939faa7c54e7b4b28d115e748a85f134876a02";
})
];
buildInputs = buildInputs =
[ libgpgerror ] [ libgpgerror ]
++ lib.optional enableCapabilities libcap; ++ lib.optional enableCapabilities libcap;