Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions pkgs/development/interpreters/perl/cross-fdopendir.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
From f702c387e6940fab3801d7562a668b974a2b3a8f Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 30 May 2025 12:29:54 -0700
Subject: [PATCH] add d_fdopendir configuration

---
cnf/configure_func.sh | 1 +
1 file changed, 1 insertion(+)

diff --git a/cnf/configure_func.sh b/cnf/configure_func.sh
index 4c13e4c..b24fe03 100644
--- a/cnf/configure_func.sh
+++ b/cnf/configure_func.sh
@@ -83,6 +83,7 @@ checkfunc d_fchmodat 'fchmodat' "0,NULL,0,0" 'unistd.h sys/stat.h'
checkfunc d_fchown 'fchown' "0,0,0" 'unistd.h'
checkfunc d_fcntl 'fcntl' "0,0" 'unistd.h fcntl.h'
checkfunc d_fdclose 'fdclose' "NULL,NULL" 'stdio.h'
+checkfunc d_fdopendir 'fdopendir' "0" 'dirent.h'
checkfunc d_ffs 'ffs' "0" 'strings.h'
checkfunc d_ffsl 'ffsl' "0" 'strings.h'
checkfunc d_fgetpos 'fgetpos' "NULL, 0" 'stdio.h'
9 changes: 7 additions & 2 deletions pkgs/development/interpreters/perl/interpreter.nix
Original file line number Diff line number Diff line change
Expand Up @@ -317,15 +317,20 @@ stdenv.mkDerivation (
};
}
// lib.optionalAttrs crossCompiling rec {
crossVersion = "1.6";
crossVersion = "1.6.2";

perl-cross-src = fetchFromGitHub {
name = "perl-cross-${crossVersion}";
owner = "arsv";
repo = "perl-cross";
rev = crossVersion;
sha256 = "sha256-TVDLxw8ctl64LSfLfB4/WLYlSTO31GssSzmdVfqkBmg=";
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
];
Comment on lines +329 to +333

@Artturin Artturin Aug 17, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This overrides the patches above

++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch
, which breaks, for example, ModuleBuild.
:P

Making a PR


depsBuildBuild = [
buildPackages.stdenv.cc
Expand Down
Loading