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

stdenv.mkDerivation: correct requiredSystemFeatures gccarch condition (#403960)

Browse Source
This commit is contained in:
Aleksana
2025-05-23 09:59:51 +08:00
committed by GitHub
parent b2fc900a32 8571cc18d9
commit 4cd6298443
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/generic/make-derivation.nix
+23 -5
View File
@@ -570,11 +570,29 @@ let
// optionalAttrs (hardeningDisable != [ ] || hardeningEnable != [ ] || stdenv.hostPlatform.isMusl) {
NIX_HARDENING_ENABLE = builtins.concatStringsSep " " enabledHardeningOptions;
}
// optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) {
requiredSystemFeatures = attrs.requiredSystemFeatures or [ ] ++ [
"gccarch-${stdenv.hostPlatform.gcc.arch}"
];
}
//
# TODO: remove platform condition
# Enabling this check could be a breaking change as it requires to edit nix.conf
# NixOS module already sets gccarch, unsure of nix installers and other distributions
optionalAttrs
(
stdenv.buildPlatform ? gcc.arch
&& !(
stdenv.buildPlatform.isAarch64
&& (
# `aarch64-darwin` sets `{gcc.arch = "armv8.3-a+crypto+sha2+...";}`
stdenv.buildPlatform.isDarwin
||
# `aarch64-linux` has `{ gcc.arch = "armv8-a"; }` set by default
stdenv.buildPlatform.gcc.arch == "armv8-a"
)
)
)
{
requiredSystemFeatures = attrs.requiredSystemFeatures or [ ] ++ [
"gccarch-${stdenv.buildPlatform.gcc.arch}"
];
}
// optionalAttrs (stdenv.buildPlatform.isDarwin) (
let
allDependencies = concatLists (concatLists dependencies);