swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 13:29:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
treewide: move more NIX_CFLAGS_COMPILE to env
This commit is contained in:
Weijia Wang 2023-02-25 14:14:07 +02:00 committed by GitHub
parent a24766e3bd 1dfe93fe85
commit cbcdfdd7b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/games/2048-cli/default.nix
View file

@ -35,7 +35,7 @@ stdenv.mkDerivation (self: {
dontConfigure = true; dontConfigure = true;
NIX_CFLAGS_COMPILE="-I${lib.getDev gettext}/share/gettext/"; env.NIX_CFLAGS_COMPILE = "-I${lib.getDev gettext}/share/gettext/";
makeFlags = [ makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc" "CC=${stdenv.cc.targetPrefix}cc"

2
pkgs/os-specific/linux/rtl8814au/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];
NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
prePatch = '' prePatch = ''
substituteInPlace ./Makefile \ substituteInPlace ./Makefile \

2
pkgs/servers/mqtt/nanomq/default.nix
View file

@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DNNG_ENABLE_TLS=ON" "-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; { meta = with lib; {
description = "An ultra-lightweight and blazing-fast MQTT broker for IoT edge"; description = "An ultra-lightweight and blazing-fast MQTT broker for IoT edge";

2
pkgs/servers/shishi/default.nix
View file

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
(enableFeature true "arcfour") (enableFeature true "arcfour")
]; ];
NIX_CFLAGS_COMPILE env.NIX_CFLAGS_COMPILE
= optionalString stdenv.isDarwin "-DBIND_8_COMPAT"; = optionalString stdenv.isDarwin "-DBIND_8_COMPAT";
doCheck = true; doCheck = true;