diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-02-25 13:00:47 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-02-25 13:00:47 +0200 |
| commit | 1dfe93fe8585a336672b6a7a3541adf58001261f (patch) | |
| tree | a61ba13819df60b1cd8ba2f4bbee49c6c2e3acc1 | |
| parent | b73601f559b3c1e9fc5ffaf0d5293b946e1f1c98 (diff) | |
treewide: move more NIX_CFLAGS_COMPILE to env
| -rw-r--r-- | pkgs/games/2048-cli/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/rtl8814au/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/mqtt/nanomq/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/shishi/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/games/2048-cli/default.nix b/pkgs/games/2048-cli/default.nix index 947973c0fb31c..bc93d51b10fdd 100644 --- a/pkgs/games/2048-cli/default.nix +++ b/pkgs/games/2048-cli/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (self: { dontConfigure = true; - NIX_CFLAGS_COMPILE="-I${lib.getDev gettext}/share/gettext/"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev gettext}/share/gettext/"; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index d8825f018979c..c11493237cdcc 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix index 482c274f2112a..ee56a44c11ca5 100644 --- a/pkgs/servers/mqtt/nanomq/default.nix +++ b/pkgs/servers/mqtt/nanomq/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { "-DNNG_ENABLE_TLS=ON" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; meta = with lib; { description = "An ultra-lightweight and blazing-fast MQTT broker for IoT edge"; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index d752c1bb8aee5..1e93613808d5a 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { (enableFeature true "arcfour") ]; - NIX_CFLAGS_COMPILE + env.NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-DBIND_8_COMPAT"; doCheck = true; |