Merge pull request #112181 from bobrik/ivan/libpcap-no-explicit-arch
libpcap: disable universal build for libpcap on darwin
This commit is contained in:
commit
e9d8a612fb
1 changed files with 2 additions and 4 deletions
|
@ -21,13 +21,11 @@ stdenv.mkDerivation rec {
|
|||
linux = "linux";
|
||||
darwin = "bpf";
|
||||
}.${stdenv.hostPlatform.parsed.kernel.name})
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"--disable-universal"
|
||||
] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform)
|
||||
[ "ac_cv_linux_vers=2" ];
|
||||
|
||||
prePatch = optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure --replace " -arch i386" ""
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
if [ "$dontDisableStatic" -ne "1" ]; then
|
||||
rm -f $out/lib/libpcap.a
|
||||
|
|
Loading…
Reference in a new issue