summary refs log tree commit diff
path: root/pkgs/development/libraries/libpcap
diff options
context:
space:
mode:
authorWout Mertens <Wout.Mertens@gmail.com>2014-10-14 13:38:20 +0200
committerWout Mertens <Wout.Mertens@gmail.com>2014-10-14 13:40:41 +0200
commitd6d8aef47b185993579393cc1cd90a623ef55f79 (patch)
treea10df12600b74f214aa41324fab158ff812e4e24 /pkgs/development/libraries/libpcap
parenta1217e5b1a3d1d4aba4d3cd2507cf453b8ab54b1 (diff)
downloadnixpkgs-d6d8aef47b185993579393cc1cd90a623ef55f79.tar
nixpkgs-d6d8aef47b185993579393cc1cd90a623ef55f79.tar.gz
nixpkgs-d6d8aef47b185993579393cc1cd90a623ef55f79.tar.bz2
nixpkgs-d6d8aef47b185993579393cc1cd90a623ef55f79.tar.lz
nixpkgs-d6d8aef47b185993579393cc1cd90a623ef55f79.tar.xz
nixpkgs-d6d8aef47b185993579393cc1cd90a623ef55f79.tar.zst
nixpkgs-d6d8aef47b185993579393cc1cd90a623ef55f79.zip
libpcap: Don't force Linux pcap type
Fixes building on Darwin #4515
Diffstat (limited to 'pkgs/development/libraries/libpcap')
-rw-r--r--pkgs/development/libraries/libpcap/default.nix5
1 files 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 = {