talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

perl: Fix applying all the patches on cross

Browse Source 
Applying the patches was broken in a2e1f82167a613134a7e24d461595f3a8b90d402
because a `patches` attr was added after `//` which overrode the `patches` before the `//`
This commit is contained in:
Artturin 2025-08-17 22:33:16 +03:00
parent a21deff818
commit 24ecea845f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/interpreters/perl/interpreter.nix
View File

@ -87,6 +87,9 @@ stdenv.mkDerivation (
./cpp-precomp.patch ./cpp-precomp.patch
./sw_vers.patch ./sw_vers.patch
] ]
# fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option
# https://github.com/arsv/perl-cross/pull/159
++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross-fdopendir.patch
++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch
++ lib.optional (crossCompiling && (lib.versionOlder version "5.40.0")) ./cross.patch; ++ lib.optional (crossCompiling && (lib.versionOlder version "5.40.0")) ./cross.patch;
@ -324,11 +327,8 @@ stdenv.mkDerivation (
rev = crossVersion; rev = crossVersion;
hash = "sha256-mG9ny+eXGBL4K/rXqEUPSbar+4Mq4IaQrGRFIHIyAAw="; hash = "sha256-mG9ny+eXGBL4K/rXqEUPSbar+4Mq4IaQrGRFIHIyAAw=";
}; };
patches = [
# fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option # Patches are above!!!
# https://github.com/arsv/perl-cross/pull/159
./cross-fdopendir.patch
];
depsBuildBuild = [ depsBuildBuild = [
buildPackages.stdenv.cc buildPackages.stdenv.cc