diff options
| author | Will Dietz <w@wdtz.org> | 2017-10-30 16:25:05 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:46 -0600 |
| commit | f96d0d114e8d0788d3328f86d055f54a421ba2ed (patch) | |
| tree | e7e08377a59c215e3588ecfd6878d4dbfea067e4 | |
| parent | 32b472dd9d69f7cb5fff32058767c72d0d9799e3 (diff) | |
| download | nixpkgs-f96d0d114e8d0788d3328f86d055f54a421ba2ed.tar nixpkgs-f96d0d114e8d0788d3328f86d055f54a421ba2ed.tar.gz nixpkgs-f96d0d114e8d0788d3328f86d055f54a421ba2ed.tar.bz2 nixpkgs-f96d0d114e8d0788d3328f86d055f54a421ba2ed.tar.lz nixpkgs-f96d0d114e8d0788d3328f86d055f54a421ba2ed.tar.xz nixpkgs-f96d0d114e8d0788d3328f86d055f54a421ba2ed.tar.zst nixpkgs-f96d0d114e8d0788d3328f86d055f54a421ba2ed.zip | |
libnet: Add patch from alpine to fix build on musl
| -rw-r--r-- | pkgs/development/libraries/libnet/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libnet/fix-includes.patch | 29 |
2 files changed, 31 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index a93c16d784d..f642ad5ccfa 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj"; }; + patches = [ ./fix-includes.patch ]; + meta = with stdenv.lib; { homepage = https://github.com/sam-github/libnet; description = "Portable framework for low-level network packet construction"; diff --git a/pkgs/development/libraries/libnet/fix-includes.patch b/pkgs/development/libraries/libnet/fix-includes.patch new file mode 100644 index 00000000000..5eb86bc37b7 --- /dev/null +++ b/pkgs/development/libraries/libnet/fix-includes.patch @@ -0,0 +1,29 @@ +--- libnet-1.1.6.orig/src/libnet_link_linux.c ++++ libnet-1.1.6/src/libnet_link_linux.c +@@ -30,26 +30,15 @@ + #include <sys/time.h> + + #include <net/if.h> +-#if (__GLIBC__) + #include <netinet/if_ether.h> + #include <net/if_arp.h> +-#else +-#include <linux/if_arp.h> +-#include <linux/if_ether.h> +-#endif + + #if (HAVE_PACKET_SOCKET) + #ifndef SOL_PACKET + #define SOL_PACKET 263 + #endif /* SOL_PACKET */ +-#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 + #include <netpacket/packet.h> + #include <net/ethernet.h> /* the L2 protocols */ +-#else +-#include <asm/types.h> +-#include <linux/if_packet.h> +-#include <linux/if_ether.h> /* The L2 protocols */ +-#endif + #endif /* HAVE_PACKET_SOCKET */ + + #include "../include/libnet.h" |