cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #48258 from volth/perlpackages-cross

Browse source 
perlPackages: cross-compilation fixes
This commit is contained in:
Jörg Thalheim 2018-10-13 09:31:40 +01:00 committed by GitHub
commit 5bdf248b43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/top-level/perl-packages.nix
View file

@ -8011,7 +8011,7 @@ let
sha256 = "0nlgdzy40q26z8qhwngsd461glyai8dpwaccyhiljmrkaqwdjxz2";
};
# Do not abort cross-compilation on failure to load native JSON module into host perl
preConfigure = ''
preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
substituteInPlace Makefile.PL --replace "exit 0;" ""
'';
buildInputs = [ TestPod ];
@ -8854,6 +8854,10 @@ let
sha256 = "dda2578d7b32152c4afce834761a61d117de286c705a9f7972c7ac6032ca5953";
};
propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ];
# support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module)
postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
substituteInPlace Makefile.PL --replace 'if has_module' 'if 0; #'
'';
meta = with stdenv.lib; {
description = "The World-Wide Web library for Perl";
license = with licenses; [ artistic1 gpl1Plus ];
@ -11107,7 +11111,7 @@ let
url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz";
sha256 = "8391696db9e96c374b72984c0bad9c7d1c9f3b4efe68f9ddf429a77548e0e269";
};
nativeBuildInputs = [ pkgs.pkgconfig ];
nativeBuildInputs = [ pkgs.buildPackages.pkgconfig ];
buildInputs = [ pkgs.dbus TestPod TestPodCoverage ];
propagatedBuildInputs = [ XMLTwig ];
meta = {
@ -17596,9 +17600,11 @@ let
url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz;
sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s";
};
patchPhase = if stdenv.isCygwin then ''
patchPhase = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
substituteInPlace Expat/Makefile.PL --replace 'use English;' '#'
'' + stdenv.lib.optionalString stdenv.isCygwin ''
sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm
'' else null;
'';
makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include";
propagatedBuildInputs = [ LWP ];
};