diff options
| author | Artturin <Artturin@artturin.com> | 2023-02-19 21:23:32 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-02-22 21:23:04 +0200 |
| commit | f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a (patch) | |
| tree | 01a46081dd6fc9d0a4c68be1c1844a8764bd8461 /pkgs/tools/misc/grub | |
| parent | 6f6cc4a22db345c66bcb69c26469b0140ca3be44 (diff) | |
| download | nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.gz nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.bz2 nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.lz nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.xz nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.zst nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.zip | |
treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported which will be a issue with some patches and some wrappers like cc-wrapper this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists in env cause a eval failure
Diffstat (limited to 'pkgs/tools/misc/grub')
| -rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub/trusted.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 16db1cb2ef1..b6125b9faf7 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -339,7 +339,7 @@ stdenv.mkDerivation rec { separateDebugInfo = !xenSupport; # Work around a bug in the generated flex lexer (upstream flex bug?) - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; preConfigure = '' for i in "tests/util/"*.in diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index e4efceea888..559eec9bbdd 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" "pic" ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; # generated code redefines yyfree + env.NIX_CFLAGS_COMPILE = "-Wno-error"; # generated code redefines yyfree preConfigure = '' for i in "tests/util/"*.in |