pyrox.dev / nixpkgs
lol
fork atom

{libedit,sharutils}: move env vars to `env.*`

Closes https://github.com/NixOS/nixpkgs/issues/273746
See https://github.com/NixOS/nixpkgs/pull/217206

Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>

Mitchell Skaggs d0f90d9c fcb7c27c

+4 -4
unified split
+3 -3
pkgs/development/libraries/libedit/default.nix
··· 21 21 # There is a DR to fix this issue with Clang which is not merged 22 22 # yet. 23 23 # https://reviews.llvm.org/D137043 24 - NIX_CFLAGS_COMPILE = lib.optional 25 - (stdenv.targetPlatform.isMusl && stdenv.cc.isClang) 26 - "-D__STDC_ISO_10646__=201103L"; 24 + env.NIX_CFLAGS_COMPILE = 25 + lib.optionalString (stdenv.targetPlatform.isMusl && stdenv.cc.isClang) 26 + "-D__STDC_ISO_10646__=201103L"; 27 27 28 28 patches = [ ./01-cygwin.patch ]; 29 29
+1 -1
pkgs/tools/archivers/sharutils/default.nix
··· 59 59 ''; 60 60 61 61 # Workaround to fix the static build on macOS. 62 - NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; 62 + env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; 63 63 64 64 doCheck = true; 65 65