Merge pull request #218213 from wegank/nix-cflags-env
treewide: move more NIX_CFLAGS_COMPILE to env
This commit is contained in:
commit
cbcdfdd7b0
4 changed files with 4 additions and 4 deletions
|
@ -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"
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue