From 24ecea845ff32d8fb6802d81c78122ed1a2cbdf5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 17 Aug 2025 22:33:16 +0300 Subject: [PATCH] perl: Fix applying all the patches on cross Applying the patches was broken in a2e1f82167a613134a7e24d461595f3a8b90d402 because a `patches` attr was added after `//` which overrode the `patches` before the `//` --- pkgs/development/interpreters/perl/interpreter.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 58f66bc811dd..42ac17c9fda2 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -87,6 +87,9 @@ stdenv.mkDerivation ( ./cpp-precomp.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.versionOlder version "5.40.0")) ./cross.patch; @@ -324,11 +327,8 @@ stdenv.mkDerivation ( rev = crossVersion; hash = "sha256-mG9ny+eXGBL4K/rXqEUPSbar+4Mq4IaQrGRFIHIyAAw="; }; - patches = [ - # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option - # https://github.com/arsv/perl-cross/pull/159 - ./cross-fdopendir.patch - ]; + + # Patches are above!!! depsBuildBuild = [ buildPackages.stdenv.cc