Unverified Commit cbcdfdd7 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #218213 from wegank/nix-cflags-env 

treewide: move more NIX_CFLAGS_COMPILE to env
parents a24766e3 1dfe93fe

pkgs/games/2048-cli/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"

pkgs/os-specific/linux/rtl8814au/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 \

pkgs/servers/mqtt/nanomq/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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";

pkgs/servers/shishi/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;