From bc0181b284b81bbc5959bfbe5e0fac21a47ca649 Mon Sep 17 00:00:00 2001 From: Harinn Date: Wed, 20 May 2026 18:38:50 +0700 Subject: [PATCH] gromacs: fix build with gcc 15 --- .../science/molecular-dynamics/gromacs/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index e4d07d925053..fe76b4457b0f 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch2, cmake, hwloc, fftw, @@ -69,7 +70,17 @@ stdenv.mkDerivation rec { inherit (source) hash; }; - patches = [ (if enablePlumed then ./pkgconfig-2024.patch else ./pkgconfig-2025.patch) ]; + patches = [ + # Fix pkg-config paths for the version-specific gromacs variant. + (if enablePlumed then ./pkgconfig-2024.patch else ./pkgconfig-2025.patch) + ] + ++ lib.optional enablePlumed ( + # Backport gcc 15 cstdint include fix. + fetchpatch2 { + url = "https://gitlab.com/gromacs/gromacs/-/commit/e0180bc37f3111d7dcaffca3854c088ed910c3b4.diff"; + hash = "sha256-TvTzfb/RETAzFpYfFFr6/L5GV1Pile16gVJhNigwAB4="; + } + ); postPatch = lib.optionalString enablePlumed '' plumed patch -p -e gromacs-${source.version}