gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv.mkDerivation: use or statement for default hardening flags

Browse Source 
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;`?"
This commit is contained in:
Eman Resu
2026-05-09 16:40:36 -04:00
parent ce35986f7f
commit ac796e9827
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/generic/make-derivation.nix
+1 -5
View File
@@ -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";