diff options
Diffstat (limited to 'pkgs/development/libraries/libpcap')
| -rw-r--r-- | pkgs/development/libraries/libpcap/default.nix | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 604fd3ee446..f3d3587c14f 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,33 +1,28 @@ -{ stdenv, fetchurl, flex, bison, bluez, pkgconfig, withBluez ? false }: +{ lib, stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libpcap"; - version = "1.9.1"; + version = "1.10.1"; src = fetchurl { url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - sha256 = "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3"; + sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ="; }; nativeBuildInputs = [ flex bison ] - ++ optionals withBluez [ bluez.dev pkgconfig ]; + ++ optionals withBluez [ bluez.dev pkg-config ]; # We need to force the autodetection because detection doesn't # work in pure build environments. configureFlags = [ - ("--with-pcap=" + { - linux = "linux"; - darwin = "bpf"; - }.${stdenv.hostPlatform.parsed.kernel.name}) + "--with-pcap=${if stdenv.isLinux then "linux" else "bpf"}" + ] ++ 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 |