diff --git a/pkgs/by-name/ne/netris/configure-fixes-for-gcc-14.patch b/pkgs/by-name/ne/netris/configure-fixes-for-gcc-14.patch new file mode 100644 index 0000000000000..a2e41ce96a783 --- /dev/null +++ b/pkgs/by-name/ne/netris/configure-fixes-for-gcc-14.patch @@ -0,0 +1,63 @@ +From 9f82b88e17f5e04929eff96c673dac5810006c87 Mon Sep 17 00:00:00 2001 +From: Reno Dakota +Date: Thu, 5 Dec 2024 09:49:40 +0000 +Subject: [PATCH] configure fixes for gcc-14 + +--- + Configure | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/Configure b/Configure +index fbc57a8..e8cea16 100755 +--- a/Configure ++++ b/Configure +@@ -76,7 +76,7 @@ done + CFLAGS="$COPT $CEXTRA" + + echo "Checking for libraries" +-echo 'main(){}' > test.c ++echo 'int main(void){ return 0; }' > test.c + LFLAGS="" + for lib in -lcurses -lncurses; do + if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then +@@ -91,8 +91,9 @@ done + + echo "Checking for on_exit()" + cat << END > test.c ++#include + void handler(void) {} +-main() { on_exit(handler, (void *)0); } ++int main(void) { on_exit(handler, (void *)0); return 0; } + END + if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then + HAS_ON_EXIT=true +@@ -103,7 +104,7 @@ fi + echo "Checking for sigprocmask()" + cat << END > test.c + #include +-main() { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); } ++int main(void) { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); return 0; } + END + if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then + HAS_SIGPROCMASK=true +@@ -114,7 +115,7 @@ fi + echo "Checking for getopt.h" + cat << END > test.c + #include +-main(){} ++int main(void){ return 0; } + END + + if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then +@@ -126,7 +127,7 @@ fi + echo "Checking for memory.h" + cat << END > test.c + #include +-main(){} ++int main(void){ return 0; } + END + + if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then +-- +2.47.0 + diff --git a/pkgs/by-name/ne/netris/package.nix b/pkgs/by-name/ne/netris/package.nix index 583d6efa58fe0..92b4cb123922e 100644 --- a/pkgs/by-name/ne/netris/package.nix +++ b/pkgs/by-name/ne/netris/package.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation { sha256 = "0gmxbpn50pnffidwjchkzph9rh2jm4wfq7hj8msp5vhdq5h0z9hm"; }; + patches = [ + # https://github.com/naclander/netris/pull/1 + ./configure-fixes-for-gcc-14.patch + ]; + buildInputs = [ ncurses ]; @@ -18,6 +23,11 @@ stdenv.mkDerivation { configureScript = "./Configure"; dontAddPrefix = true; + configureFlags = [ + "--cc" "${stdenv.cc.targetPrefix}cc" + "-O2" + ]; + installPhase = '' mkdir -p $out/bin cp ./netris $out/bin @@ -28,6 +38,6 @@ stdenv.mkDerivation { mainProgram = "netris"; license = licenses.gpl2Plus; maintainers = with maintainers; [ patryk27 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }