diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-01-12 17:13:31 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-01-12 17:15:14 +0300 |
| commit | e9597ff555012848e3cf20ab2d30780f6892ab85 (patch) | |
| tree | 47a5bfac7bc2ba8e8673dc76b7d8c86e7e84c34f /pkgs/development/libraries/libpcap | |
| parent | bbfbadf327af8454fc449fb567db00ab254cfc3c (diff) | |
| download | nixpkgs-e9597ff555012848e3cf20ab2d30780f6892ab85.tar nixpkgs-e9597ff555012848e3cf20ab2d30780f6892ab85.tar.gz nixpkgs-e9597ff555012848e3cf20ab2d30780f6892ab85.tar.bz2 nixpkgs-e9597ff555012848e3cf20ab2d30780f6892ab85.tar.lz nixpkgs-e9597ff555012848e3cf20ab2d30780f6892ab85.tar.xz nixpkgs-e9597ff555012848e3cf20ab2d30780f6892ab85.tar.zst nixpkgs-e9597ff555012848e3cf20ab2d30780f6892ab85.zip | |
Revert "libpcap: support static build"
This reverts commit ee6ca494d2427f13fc9bb09ef197f768b53b2637.
Diffstat (limited to 'pkgs/development/libraries/libpcap')
| -rw-r--r-- | pkgs/development/libraries/libpcap/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 4dc7d43122b..b8985bbed82 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" "" |