From d6d8aef47b185993579393cc1cd90a623ef55f79 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Tue, 14 Oct 2014 13:38:20 +0200 Subject: [PATCH] libpcap: Don't force Linux pcap type Fixes building on Darwin #4515 --- pkgs/development/libraries/libpcap/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 11eccb0a0e3..77b0d3975c0 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -10,14 +10,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison ]; - configureFlags = "--with-pcap=linux"; + # Apparently, 32 bit systems need this forced? Not verified if still needed. + configureFlags = stdenv.lib.optionals (stdenv.system == "i686-linux") "--with-pcap=linux"; preInstall = ''mkdir -p $out/bin''; crossAttrs = { # Stripping hurts in static libraries dontStrip = true; - configureFlags = [ "--with-pcap=linux" "ac_cv_linux_vers=2" ]; + configureFlags = configureFlags ++ [ "ac_cv_linux_vers=2" ]; }; meta = {