From 82aa99878caa12cd137d8b71028b1645ef35e8fd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 31 Dec 2025 10:53:53 +0100 Subject: [PATCH] ocamlPackages.zelus: fix for gcc15 --- pkgs/development/ocaml-modules/zelus/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/zelus/default.nix b/pkgs/development/ocaml-modules/zelus/default.nix index 3bd4369bec46..24edc51a8f1e 100644 --- a/pkgs/development/ocaml-modules/zelus/default.nix +++ b/pkgs/development/ocaml-modules/zelus/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + ocaml, buildDunePackage, fetchFromGitHub, menhir, @@ -11,7 +12,16 @@ buildDunePackage rec { pname = "zelus"; version = "2.2"; - minimalOCamlVersion = "4.08.1"; + env = + # Fix build with gcc15 + lib.optionalAttrs + ( + lib.versionAtLeast ocaml.version "4.10" && lib.versionOlder ocaml.version "4.14" + || lib.versions.majorMinor ocaml.version == "5.0" + ) + { + NIX_CFLAGS_COMPILE = "-std=gnu11"; + }; src = fetchFromGitHub { owner = "INRIA";