From e9597ff555012848e3cf20ab2d30780f6892ab85 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Tue, 12 Jan 2016 17:13:31 +0300 Subject: [PATCH] Revert "libpcap: support static build" This reverts commit ee6ca494d2427f13fc9bb09ef197f768b53b2637. --- pkgs/development/libraries/libpcap/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 4dc7d43122b3..b8985bbed82f 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, flex, bison -, enableStatic ? false -}: +{ stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { name = "libpcap-1.7.4"; @@ -15,10 +13,9 @@ stdenv.mkDerivation rec { # We need to force the autodetection because detection doesn't # work in pure build enviroments. configureFlags = - (if stdenv.isLinux then [ "--with-pcap=linux" ] - else if stdenv.isDarwin then [ "--with-pcap=bpf" ] - else []) - ++ stdenv.lib.optional enableStatic "--enable-static"; + if stdenv.isLinux then [ "--with-pcap=linux" ] + else if stdenv.isDarwin then [ "--with-pcap=bpf" ] + else []; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace " -arch i386" ""