public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcpdump: Don't use stdenv.cross

Browse Source
This commit is contained in:
hsloan 2017-06-28 16:47:36 -04:00 committed by John Ericson
parent 1b882edf78
commit 822084fa37
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/tcpdump/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, libpcap, enableStatic ? false }: { stdenv, fetchurl, libpcap, enableStatic ? false
, hostPlatform
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tcpdump-${version}"; name = "tcpdump-${version}";
@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
crossAttrs = { crossAttrs = {
LDFLAGS = if enableStatic then "-static" else ""; LDFLAGS = if enableStatic then "-static" else "";
configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional
(stdenv.cross.platform.kernelMajor == "2.4") "--disable-ipv6"); (hostPlatform.platform.kernelMajor == "2.4") "--disable-ipv6");
}; };
meta = { meta = {