nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 21:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

stdenv: move NIX_CFLAGS_LINK into env by default for makeStaticBinaries (#498046)

Browse Source
This commit is contained in:
Philip Taron
2026-03-18 00:55:57 +00:00
committed by GitHub
parent dbeb851f23 71003837dd
commit d69b59c191
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/stdenv/adapters.nix
View File

@@ -92,16 +92,22 @@ rec {
(mkDerivationSuper args).overrideAttrs (
args:
(
if (args.__structuredAttrs or false) || (args ? env.NIX_CFLAGS_LINK) then
if (args ? NIX_CFLAGS_LINK) then
lib.warn
(
"NIX_CFLAGS_LINK is an environment variable and should be defined inside `env`"
+ lib.optionalString (args ? pname) " for package ${args.pname}"
+ lib.optionalString (args ? version) "-${args.version}"
)
{
NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static";
}
else
{
env = (args.env or { }) // {
NIX_CFLAGS_LINK = toString (args.env.NIX_CFLAGS_LINK or "") + " -static";
};
}
else
{
NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static";
}
)
// lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) {
configureFlags = (args.configureFlags or [ ]) ++ [