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

Revert "libpcap: support static build"

Browse Source 
This reverts commit ee6ca494d2427f13fc9bb09ef197f768b53b2637.
This commit is contained in:
Nikolay Amiantov 2016-01-12 17:13:31 +03:00
parent bbfbadf327
commit e9597ff555
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,4 @@
{ stdenv, fetchurl, flex, bison { stdenv, fetchurl, flex, bison }:
, enableStatic ? false
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libpcap-1.7.4"; name = "libpcap-1.7.4";
@ -15,10 +13,9 @@ stdenv.mkDerivation rec {
# We need to force the autodetection because detection doesn't # We need to force the autodetection because detection doesn't
# work in pure build enviroments. # work in pure build enviroments.
configureFlags = configureFlags =
(if stdenv.isLinux then [ "--with-pcap=linux" ] if stdenv.isLinux then [ "--with-pcap=linux" ]
else if stdenv.isDarwin then [ "--with-pcap=bpf" ] else if stdenv.isDarwin then [ "--with-pcap=bpf" ]
else []) else [];
++ stdenv.lib.optional enableStatic "--enable-static";
prePatch = stdenv.lib.optionalString stdenv.isDarwin '' prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace " -arch i386" "" substituteInPlace configure --replace " -arch i386" ""