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

iptables: prune libtool files after build

Browse Source 
Otherwise -lpcap gets propagated to reverse deps
This can break strongswan build for example
https://github.com/NixOS/nixpkgs/pull/51252#issuecomment-445512680
This commit is contained in:
c0bw3b 2018-12-09 17:12:53 +01:00
parent 32788120f9
commit 705babcdf0
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/os-specific/linux/iptables/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, bison, flex, pkgconfig { stdenv, fetchurl, fetchpatch, bison, flex, pkgconfig, pruneLibtoolFiles
, libnetfilter_conntrack, libnftnl, libmnl, libpcap }: , libnetfilter_conntrack, libnftnl, libmnl, libpcap }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,16 +21,24 @@ stdenv.mkDerivation rec {
url = "https://git.netfilter.org/iptables/patch/?id=51d374ba41ae4f1bb851228c06b030b83dd2092f"; url = "https://git.netfilter.org/iptables/patch/?id=51d374ba41ae4f1bb851228c06b030b83dd2092f";
sha256 = "05fwrq03f9sm0v2bfwshbrg7pi2p978w1460arnmpay3135gj266"; sha256 = "05fwrq03f9sm0v2bfwshbrg7pi2p978w1460arnmpay3135gj266";
}) })
# extensions: libip6t_mh: fix bogus translation error # Extensions: libip6t_mh: fix bogus translation error
(fetchpatch { (fetchpatch {
url = "https://git.netfilter.org/iptables/patch/?id=5839d7fe62ff667af7132fc7d589b386951f27b3"; url = "https://git.netfilter.org/iptables/patch/?id=5839d7fe62ff667af7132fc7d589b386951f27b3";
sha256 = "0578jn1ip710z9kijwg9g2vjq2kfrbafl03m1rgi4fasz215gvkf"; sha256 = "0578jn1ip710z9kijwg9g2vjq2kfrbafl03m1rgi4fasz215gvkf";
}) })
# Prevent headers collisions between linux and netfilter (in.h and in6.h) # 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 ]; buildInputs = [ libnetfilter_conntrack libnftnl libmnl libpcap ];

11
pkgs/os-specific/linux/iptables/netinet-headers-collision.patch
View File

@ -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>