From ac796e9827bd4f43fc96c2e43b62645ed9bedd29 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Sat, 9 May 2026 16:40:36 -0400 Subject: [PATCH] stdenv.mkDerivation: use or statement for default hardening flags As suggested in PR review: "It seems like when `!stdenvHasCC`, `stdenv.cc` is `null`. So this could probably just be `defaultHardeningFlags = stdenv.cc.defaultHardeningFlags or knownHardeningFlags;`?" --- pkgs/stdenv/generic/make-derivation.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index caa2e412af6e..eaa2ca0d6afc 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -230,11 +230,7 @@ let isSingularDependency = dep: dep == null || isDerivation dep || isString dep || isPath dep; canExecuteHostOnBuild = buildPlatform.canExecute hostPlatform; - defaultHardeningFlags = - if stdenvHasCC then - (stdenv.cc.defaultHardeningFlags or knownHardeningFlags) - else - knownHardeningFlags; + defaultHardeningFlags = stdenv.cc.defaultHardeningFlags or knownHardeningFlags; hostSuffixNecessary = hostPlatform != buildPlatform && stdenvHasCC; stdenvHostSuffix = "-${hostPlatform.config}"; stdenvStaticMarker = optionalString isStatic "-static";