From 4d7da18f5c09f04249a125143d49c3da5117b951 Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Sun, 1 Apr 2018 10:47:35 +0200 Subject: [PATCH] perlPackages.Socket6: fix sv_undef compilation error Socket6.xs redefines `PV_sv_undef`, which breaks compilation from 306d5cdf03ad ("perlPackages: Add cross-compilation support."). I added a patch to remove this redefinition. Compilation is now working again. --- .../perl-modules/Socket6-sv_undef.patch | 18 ++++++++++++++++++ pkgs/top-level/perl-packages.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/perl-modules/Socket6-sv_undef.patch diff --git a/pkgs/development/perl-modules/Socket6-sv_undef.patch b/pkgs/development/perl-modules/Socket6-sv_undef.patch new file mode 100644 index 000000000000..3ed4b61b6d3e --- /dev/null +++ b/pkgs/development/perl-modules/Socket6-sv_undef.patch @@ -0,0 +1,18 @@ +diff --git a/Socket6.xs b/Socket6.xs +index 05c791c..058e9d9 100644 +--- a/Socket6.xs ++++ b/Socket6.xs +@@ -105,10 +105,6 @@ const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; + #define HAVE_INET_PTON 1 + #endif + +-#ifndef HAVE_PL_SV_UNDEF +-#define PL_sv_undef sv_undef +-#endif +- + static int + not_here(char *s) + { +-- +2.16.3 + diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8ab8def15c61..2034fd81c87b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13549,6 +13549,7 @@ let self = _self // overrides; _self = with self; { }; setOutputFlags = false; buildInputs = [ pkgs.which ]; + patches = [ ../development/perl-modules/Socket6-sv_undef.patch ]; meta = { description = "IPv6 related part of the C socket.h defines and structure manipulators"; license = stdenv.lib.licenses.bsd3;