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

Merge pull request #112181 from bobrik/ivan/libpcap-no-explicit-arch 

libpcap: disable universal build for libpcap on darwin
This commit is contained in:
Sandro 2021-02-16 01:29:12 +01:00 committed by GitHub
parent 4b31e7d6b0 4492265eb8
commit e9d8a612fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libpcap/default.nix
View File

@ -21,13 +21,11 @@ stdenv.mkDerivation rec {
linux = "linux"; linux = "linux";
darwin = "bpf"; darwin = "bpf";
}.${stdenv.hostPlatform.parsed.kernel.name}) }.${stdenv.hostPlatform.parsed.kernel.name})
] ++ optionals stdenv.isDarwin [
"--disable-universal"
] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform)
[ "ac_cv_linux_vers=2" ]; [ "ac_cv_linux_vers=2" ];
prePatch = optionalString stdenv.isDarwin ''
substituteInPlace configure --replace " -arch i386" ""
'';
postInstall = '' postInstall = ''
if [ "$dontDisableStatic" -ne "1" ]; then if [ "$dontDisableStatic" -ne "1" ]; then
rm -f $out/lib/libpcap.a rm -f $out/lib/libpcap.a