From 84de183f602c26ab99281c24e52bf1067d240e9b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 4 May 2026 11:52:51 +0100 Subject: [PATCH] ior: fix `gcc-15` build failure Without the change thye build fails on `master` as https://hydra.nixos.org/build/327774029: ``` option.c: In function 'option_parse_token': option.c:325:19: error: too many arguments to function 'fp'; expected 0, have 1 325 | fp(arg); | ^~ ~~~ ``` ZHF: #516381 --- pkgs/by-name/io/ior/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/io/ior/package.nix b/pkgs/by-name/io/ior/package.nix index 78a197edf480..9175f4017add 100644 --- a/pkgs/by-name/io/ior/package.nix +++ b/pkgs/by-name/io/ior/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, mpi, perl, autoreconfHook, @@ -19,6 +20,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WsfJWHHfkiHZ+rPk6ck6mDErTXwt6Dhgm+yqOtw4Fvo="; }; + patches = [ + # Fix gcc-15 build: + # https://github.com/hpc/ior/pull/525 + (fetchpatch { + name = "gcc-15.patch"; + url = "https://github.com/hpc/ior/commit/526c5ad06695a91a27163c520ce3305109f50bef.patch"; + hash = "sha256-HvbRMt2EcuO7kxLL9qKpozpNKEOmWuHkKQTSUhfU7/w="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config