diff options
| author | c0bw3b <c0bw3b@users.noreply.github.com> | 2018-12-09 17:12:53 +0100 |
|---|---|---|
| committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2018-12-09 17:12:53 +0100 |
| commit | 705babcdf0358e383388771acd0a663f59f05b18 (patch) | |
| tree | 068ed40a50f62a7290e8e2bc7ac7b2e883545d4d /pkgs/os-specific/linux/iptables | |
| parent | 32788120f9d136737176e172292bbd645b06d0e9 (diff) | |
| download | nixpkgs-705babcdf0358e383388771acd0a663f59f05b18.tar nixpkgs-705babcdf0358e383388771acd0a663f59f05b18.tar.gz nixpkgs-705babcdf0358e383388771acd0a663f59f05b18.tar.bz2 nixpkgs-705babcdf0358e383388771acd0a663f59f05b18.tar.lz nixpkgs-705babcdf0358e383388771acd0a663f59f05b18.tar.xz nixpkgs-705babcdf0358e383388771acd0a663f59f05b18.tar.zst nixpkgs-705babcdf0358e383388771acd0a663f59f05b18.zip | |
iptables: prune libtool files after build
Otherwise -lpcap gets propagated to reverse deps This can break strongswan build for example https://github.com/NixOS/nixpkgs/pull/51252#issuecomment-445512680
Diffstat (limited to 'pkgs/os-specific/linux/iptables')
| -rw-r--r-- | pkgs/os-specific/linux/iptables/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/iptables/netinet-headers-collision.patch | 11 |
2 files changed, 12 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 8f98391021f..ff6ce3b4889 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, bison, flex, pkgconfig +{ stdenv, fetchurl, fetchpatch, bison, flex, pkgconfig, pruneLibtoolFiles , libnetfilter_conntrack, libnftnl, libmnl, libpcap }: stdenv.mkDerivation rec { @@ -21,16 +21,24 @@ stdenv.mkDerivation rec { url = "https://git.netfilter.org/iptables/patch/?id=51d374ba41ae4f1bb851228c06b030b83dd2092f"; sha256 = "05fwrq03f9sm0v2bfwshbrg7pi2p978w1460arnmpay3135gj266"; }) - # extensions: libip6t_mh: fix bogus translation error + # Extensions: libip6t_mh: fix bogus translation error (fetchpatch { url = "https://git.netfilter.org/iptables/patch/?id=5839d7fe62ff667af7132fc7d589b386951f27b3"; sha256 = "0578jn1ip710z9kijwg9g2vjq2kfrbafl03m1rgi4fasz215gvkf"; }) # Prevent headers collisions between linux and netfilter (in.h and in6.h) - (./netinet-headers-collision.patch) + # Fixed upstream with two commits + (fetchpatch { + url = "https://git.netfilter.org/iptables/patch/?id=8d9d7e4b9ef4c6e6abab2cf35c747d7ca36824bd"; + sha256 = "0q3wcspiqym1r6dg1jhg7h8hpvsjzx1k7cs39z36mzlbmj9lm0zb"; + }) + (fetchpatch { + url = "https://git.netfilter.org/iptables/patch/?id=2908eda10bf9fc81119d4f3ad672c67918ab5955"; + sha256 = "1dci4c8b7gcdrf77l2aicrcwlbp320xjz76fhavams0b4kgs6yr3"; + }) ]; - nativeBuildInputs = [ bison flex pkgconfig ]; + nativeBuildInputs = [ bison flex pkgconfig pruneLibtoolFiles ]; buildInputs = [ libnetfilter_conntrack libnftnl libmnl libpcap ]; diff --git a/pkgs/os-specific/linux/iptables/netinet-headers-collision.patch b/pkgs/os-specific/linux/iptables/netinet-headers-collision.patch deleted file mode 100644 index 940ffa0c29c..00000000000 --- a/pkgs/os-specific/linux/iptables/netinet-headers-collision.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/linux/netfilter.h -+++ b/include/linux/netfilter.h -@@ -3,7 +3,9 @@ - - #include <linux/types.h> - -+#ifndef _NETINET_IN_H - #include <linux/in.h> - #include <linux/in6.h> -+#endif - #include <limits.h> |