From 1c4557ce2df182f6bc9c46b59132ceac980d27ff Mon Sep 17 00:00:00 2001 From: fumnanya Date: Tue, 31 Dec 2024 18:57:46 +0100 Subject: [PATCH] xoscope: fix build for gcc14 --- pkgs/by-name/xo/xoscope/fix-gcc14.patch | 15 +++++++++++++++ pkgs/by-name/xo/xoscope/package.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/by-name/xo/xoscope/fix-gcc14.patch diff --git a/pkgs/by-name/xo/xoscope/fix-gcc14.patch b/pkgs/by-name/xo/xoscope/fix-gcc14.patch new file mode 100644 index 000000000000..8f36a09e7a39 --- /dev/null +++ b/pkgs/by-name/xo/xoscope/fix-gcc14.patch @@ -0,0 +1,15 @@ +--- a/configure ++++ b/configure +@@ -7054,9 +7054,10 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include + #include +-main() { +- comedi_get_cmd_generic_timed(NULL, NULL, NULL, 0, 0); ++void main() { ++ comedi_get_cmd_generic_timed(NULL, 0, NULL, 0, 0); + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : diff --git a/pkgs/by-name/xo/xoscope/package.nix b/pkgs/by-name/xo/xoscope/package.nix index 03c975184539..d911f997cd76 100644 --- a/pkgs/by-name/xo/xoscope/package.nix +++ b/pkgs/by-name/xo/xoscope/package.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0a5ycfc1qdmibvagc82r2mhv2i99m6pndy5i6ixas3j2297g6pgq"; }; + patches = [ ./fix-gcc14.patch ]; + nativeBuildInputs = [ pkg-config gnum4