summary refs log tree commit diff
path: root/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2020-06-20 17:42:56 +0000
committervolth <volth@volth.com>2020-06-20 19:26:22 +0000
commitefc70eb6d7c3755ca7b6e6293439463f2c80b032 (patch)
treef0fc12870569d0752c14993358cb57ab6b20ff55 /pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
parente0af42b5986eab08a00e070a279bd7aba959aaef (diff)
downloadnixpkgs-efc70eb6d7c3755ca7b6e6293439463f2c80b032.tar
nixpkgs-efc70eb6d7c3755ca7b6e6293439463f2c80b032.tar.gz
nixpkgs-efc70eb6d7c3755ca7b6e6293439463f2c80b032.tar.bz2
nixpkgs-efc70eb6d7c3755ca7b6e6293439463f2c80b032.tar.lz
nixpkgs-efc70eb6d7c3755ca7b6e6293439463f2c80b032.tar.xz
nixpkgs-efc70eb6d7c3755ca7b6e6293439463f2c80b032.tar.zst
nixpkgs-efc70eb6d7c3755ca7b6e6293439463f2c80b032.zip
perlPackages.XMLParser: update patch
Diffstat (limited to 'pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch')
-rw-r--r--pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch40
1 files changed, 21 insertions, 19 deletions
diff --git a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
index add6d9df3b7..f66ed0dfe01 100644
--- a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
+++ b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
@@ -16,28 +16,30 @@ diff --git a/Makefile.PL b/Makefile.PL
 index 505d1df..fc38b76 100644
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -29,12 +29,17 @@ foreach (@ARGV) {
+@@ -28,12 +28,18 @@ foreach (@ARGV) {
  @ARGV = @replacement_args;
  
  unless (
--    check_lib(    # fill in what you prompted the user for here
--        lib     => [qw(expat)],
--        header  => ['expat.h'],
--        incpath => $expat_incpath,
--        ( $expat_libpath ? ( libpath => $expat_libpath ) : () ),
--    )
-+    #check_lib(    # fill in what you prompted the user for here
-+    #    lib     => [qw(expat)],
-+    #    header  => ['expat.h'],
-+    #    incpath => $expat_incpath,
-+    #    ( $expat_libpath ? ( libpath => $expat_libpath ) : () ),
-+    #)
-+    # The check_lib implementation fails horribly with cross-compilation.
-+    # We are giving known good paths to expat.
-+    # And in all cases, the previous behaviour of not actually failing
-+    # seemed to work just fine :/.
-+    false
- ) {
+-  check_lib(     # fill in what you prompted the user for here
+-    lib => [qw(expat)],
+-    header => ['expat.h'],
+-    incpath => $expat_incpath,
+-    ($expat_libpath?
+-    (libpath => $expat_libpath):()),
+-  )) {
++  #check_lib(     # fill in what you prompted the user for here
++  #  lib => [qw(expat)],
++  #  header => ['expat.h'],
++  #  incpath => $expat_incpath,
++  #  ($expat_libpath?
++  #  (libpath => $expat_libpath):()),
++  #)
++  # The check_lib implementation fails horribly with cross-compilation.
++  # We are giving known good paths to expat.
++  # And in all cases, the previous behaviour of not actually failing
++  # seemed to work just fine :/.
++  false
++  ) {
      warn <<'Expat_Not_Installed;';
  
 --