From d8a7cfb2deb45cbc67b6ba173052830188ee7e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 29 Dec 2025 09:37:13 +0100 Subject: [PATCH] ocaml: avoid rebuilding the default version Defining an env-var as an empty string would cause a rebuild. --- pkgs/development/compilers/ocaml/generic.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 491d11615c9f..f09ec3f79683 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -118,7 +118,9 @@ stdenv.mkDerivation ( ++ optional noNakedPointers (flags "--disable-naked-pointers" "-no-naked-pointers"); dontAddStaticConfigureFlags = lib.versionOlder version "4.08"; - env.NIX_CFLAGS_COMPILE = optionalString (lib.versionOlder version "4.14") "-std=gnu11"; + env = lib.optionalAttrs (lib.versionOlder version "4.14") { + NIX_CFLAGS_COMPILE = "-std=gnu11"; + }; # on aarch64-darwin using --host and --target causes the build to invoke # `aarch64-apple-darwin-clang` while using assembler. However, such binary