diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-04-21 20:18:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-21 20:18:27 +0100 |
commit | f7785dd61ce180691006d2e2486fd90a2fca666a (patch) | |
tree | 68343763eb503cd1a4dfc2f00d67ef0faf7408fc /pkgs/development/perl-modules | |
parent | 6908f0ce89cd3dd9fa4b3c8f5ee10f2bd9895817 (diff) | |
parent | 0964410b2893a505c88bc867b1b76e046165890c (diff) | |
download | nixpkgs-f7785dd61ce180691006d2e2486fd90a2fca666a.tar nixpkgs-f7785dd61ce180691006d2e2486fd90a2fca666a.tar.gz nixpkgs-f7785dd61ce180691006d2e2486fd90a2fca666a.tar.bz2 nixpkgs-f7785dd61ce180691006d2e2486fd90a2fca666a.tar.lz nixpkgs-f7785dd61ce180691006d2e2486fd90a2fca666a.tar.xz nixpkgs-f7785dd61ce180691006d2e2486fd90a2fca666a.tar.zst nixpkgs-f7785dd61ce180691006d2e2486fd90a2fca666a.zip |
Merge branch 'master' into minc_ecosystem
Diffstat (limited to 'pkgs/development/perl-modules')
-rw-r--r-- | pkgs/development/perl-modules/Socket6-sv_undef.patch | 18 | ||||
-rw-r--r-- | pkgs/development/perl-modules/generic/builder.sh | 2 |
2 files changed, 19 insertions, 1 deletions
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 00000000000..3ed4b61b6d3 --- /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/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 937dad971b8..b833ceb3cab 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -22,7 +22,7 @@ preConfigure() { fi done - perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=$perl/bin/perl + perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$perl/bin/perl\" } |