diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-07-17 00:33:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-17 00:33:50 -0400 |
| commit | a9ddda95d05ab8823e2e446993c77a06e936ac26 (patch) | |
| tree | 37bbc3456217d14b1ec623579593a040e4c13d1a /pkgs/top-level | |
| parent | 9cbf74bb7beba69bfafb166fb6eac382795f3432 (diff) | |
| parent | a05489fb900b0bdf24b92352624dd2b61e8808bb (diff) | |
Merge pull request #93185 from stigtsp/package/perl-www-curl-fix
perlPackages.WWWCurl: fix build
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aa50da11edfee..86cc2a29adc26 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21324,16 +21324,16 @@ let url = "mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz"; sha256 = "1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj"; }; - patches = [ ../development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch ]; + patches = [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/curl-7.71.0.patch?h=perl-www-curl&id=261d84887d736cc097abef61164339216fb79180"; + sha256 = "1hiw5lkflfa93z5d6k8fnnml0r08c653bbvvb8zx6gcrlbrdalfs"; + name = "WWWCurl-curl-7.71.0.patch"; + }) + ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-return-type"; buildInputs = [ pkgs.curl ]; - preConfigure = - '' - substituteInPlace Makefile.PL --replace '"cpp"' '"gcc -E"' - substituteInPlace Makefile.PL --replace '_LASTENTRY\z' '_LASTENTRY\z|CURL_DID_MEMORY_FUNC_TYPEDEFS\z' - ''; - NIX_CFLAGS_COMPILE = "-DCURL_STRICTER"; doCheck = false; # performs network access - meta.broken = stdenv.lib.versionAtLeast (stdenv.lib.getVersion pkgs.curl) "7.66"; # broken since "curl: 7.65.3 -> 7.66.0" }; WWWFormUrlEncoded = buildPerlModule { |