Skip to content

Commit 9eae00b

Browse files
authored
perl: Fix applying all the patches on cross (NixOS#434536)
2 parents 678be5b + 24ecea8 commit 9eae00b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkgs/development/interpreters/perl/interpreter.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ stdenv.mkDerivation (
8787
./cpp-precomp.patch
8888
./sw_vers.patch
8989
]
90+
# fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option
91+
# https://github.com/arsv/perl-cross/pull/159
92+
++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross-fdopendir.patch
9093
++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch
9194
++ lib.optional (crossCompiling && (lib.versionOlder version "5.40.0")) ./cross.patch;
9295

@@ -324,11 +327,8 @@ stdenv.mkDerivation (
324327
rev = crossVersion;
325328
hash = "sha256-mG9ny+eXGBL4K/rXqEUPSbar+4Mq4IaQrGRFIHIyAAw=";
326329
};
327-
patches = [
328-
# fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option
329-
# https://github.com/arsv/perl-cross/pull/159
330-
./cross-fdopendir.patch
331-
];
330+
331+
# Patches are above!!!
332332

333333
depsBuildBuild = [
334334
buildPackages.stdenv.cc

0 commit comments

Comments
 (0)