diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 6c02cf3a21bf..c6840241c609 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -37,9 +37,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO: stdenv’s setup.sh should be aware of patch directories. It’s very # convenient to keep them in a separate directory but we can defer listing the # directory until derivation realization to avoid unnecessary Nix evaluations. - patches = - lib.filesystem.listFilesRecursive ./patches - ++ lib.optionals stdenv.hostPlatform.isMusl (lib.filesystem.listFilesRecursive ./musl-patches); + patches = lib.filesystem.listFilesRecursive ./patches; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/development/tools/build-managers/gnumake/musl-patches/0004-Fix-signatures-for-getenv-getopt.patch b/pkgs/development/tools/build-managers/gnumake/musl-patches/0004-Fix-signatures-for-getenv-getopt.patch deleted file mode 100644 index f37b7a49e341..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/musl-patches/0004-Fix-signatures-for-getenv-getopt.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 776f707b5bb67d4c0c15f981b5a1b6d7f3a9cebc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 22 Mar 2025 14:24:57 -0700 -Subject: [PATCH 4/5] Fix signatures for getenv/getopt - -GCC-15 complains about missing parameters, this gets found -out when using non-glibc ( e.g. musl ) C library - -Fixes -lib/fnmatch.c:124:14: error: conflicting types for 'getenv'; have 'char *(void)' -| 124 | extern char *getenv (); -| | ^~~~~~ - -src/getopt.c: Define parameters of getenv() and getopt(). -src/getopt.h: Ditto. ---- -Link: https://lists.gnu.org/archive/html/bug-make/2025-03/msg00032.html - src/getopt.c | 2 +- - src/getopt.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/getopt.c b/src/getopt.c -index 7a792de8..76251ccb 100644 ---- a/src/getopt.c -+++ b/src/getopt.c -@@ -202,7 +202,7 @@ static char *posixly_correct; - whose names are inconsistent. */ - - #ifndef getenv --extern char *getenv (); -+extern char *getenv (const char *); - #endif - - static char * -diff --git a/src/getopt.h b/src/getopt.h -index df18ceeb..d8bb2263 100644 ---- a/src/getopt.h -+++ b/src/getopt.h -@@ -102,7 +102,7 @@ struct option - errors, only prototype getopt for the GNU C library. */ - extern int getopt (int argc, char *const *argv, const char *shortopts); - #else /* not __GNU_LIBRARY__ */ --extern int getopt (); -+extern int getopt (int, char * const*, const char *); - #endif /* __GNU_LIBRARY__ */ - extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); --- -2.51.2 - diff --git a/pkgs/development/tools/build-managers/gnumake/musl-patches/0005-Fix-signatures-for-getenv-getopt.patch b/pkgs/development/tools/build-managers/gnumake/musl-patches/0005-Fix-signatures-for-getenv-getopt.patch deleted file mode 100644 index c594ba27c2a9..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/musl-patches/0005-Fix-signatures-for-getenv-getopt.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4169ae60a7cb2c2bc788daa2c91441cc807acbc Mon Sep 17 00:00:00 2001 -From: Yureka -Date: Mon, 22 Dec 2025 20:53:31 +0100 -Subject: [PATCH 5/5] Fix signatures for getenv/getopt - -As the previous commit, this fixes GCC-15 complaining about mismatching -definitions with non-glibc (musl) C library. - -Fixes -lib/fnmatch.c:124:14: error: conflicting types for 'getenv'; have 'char *(void)' -| 124 | extern char *getenv (); -| | ^~~~~~ - -lib/fnmatch.c: Define parameters of getenv() ---- - lib/fnmatch.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/fnmatch.c b/lib/fnmatch.c -index 01da376b..cb1c856b 100644 ---- a/lib/fnmatch.c -+++ b/lib/fnmatch.c -@@ -121,7 +121,7 @@ USA. */ - whose names are inconsistent. */ - - # if !defined _LIBC && !defined getenv --extern char *getenv (); -+extern char *getenv (const char *); - # endif - - # ifndef errno --- -2.51.2 -