about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch')
-rw-r--r--nixpkgs/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch40
1 files changed, 19 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch b/nixpkgs/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
index f66ed0dfe019..add6d9df3b7f 100644
--- a/nixpkgs/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
+++ b/nixpkgs/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
@@ -16,30 +16,28 @@ diff --git a/Makefile.PL b/Makefile.PL
 index 505d1df..fc38b76 100644
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -28,12 +28,18 @@ foreach (@ARGV) {
+@@ -29,12 +29,17 @@ 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;';
  
 --