mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-03-08 01:24:09 +01:00
deep-merge env in mkDerivation to preserve GCC5 prefix
The shallow `//` merge in edk2.mkDerivation allowed consumers' `env`
attrs to completely overwrite the base `env` containing GCC5_*_PREFIX,
causing cross-compilation failures (e.g. x86_64 -> aarch64 OVMF) with
`gcc: error: unrecognized command-line option '-mlittle-endian'`.
Exclude `env` from the consumer attrs spread and explicitly deep-merge
it, ensuring GCC5_*_PREFIX is always set as a base while consumer `env`
keys (NIX_CFLAGS_COMPILE, PYTHON_COMMAND, etc.) are merged on top.
Fixes regression from
|
||
|---|---|---|
| .. | ||
| ed | ||
| ed-odyssey-materials-helper | ||
| edac-utils | ||
| eddie | ||
| eddy | ||
| eden | ||
| edencommon | ||
| edgetpu-compiler | ||
| edgetx | ||
| edhm-ui | ||
| edid-generator | ||
| edido | ||
| edir | ||
| edit | ||
| editline | ||
| editorconfig-checker | ||
| editorconfig-core-c | ||
| editres | ||
| edk2 | ||
| edk2-uefi-shell | ||
| edl | ||
| edlib | ||
| edlin | ||
| edmarketconnector | ||
| edname | ||
| edopro | ||
| edukai | ||
| eduke32 | ||
| eduli | ||
| edusong | ||
| eduvpn-client | ||
| edwin | ||
| edwood | ||