treewide: move CPPFLAGS into env for structuredAttrs (#492209)
This commit is contained in:
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
configureFlags = [ "--enable-ipv6" ];
|
||||
|
||||
# fix ipv6 on darwin
|
||||
CPPFLAGS = "-D__APPLE_USE_RFC_3542";
|
||||
env.CPPFLAGS = "-D__APPLE_USE_RFC_3542";
|
||||
|
||||
meta = {
|
||||
description = "Permanent DNS caching";
|
||||
|
||||
@@ -58,7 +58,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
# from Dockerfile
|
||||
CPPFLAGS = "-DPNG_ARM_NEON_OPT=0";
|
||||
env.CPPFLAGS = "-DPNG_ARM_NEON_OPT=0";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
|
||||
@@ -26,9 +26,10 @@ stdenv.mkDerivation {
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
# main.cpp:1568:36: error: '%s' directive output may be truncated writing up to 557 bytes into a region of size 5
|
||||
CPPFLAGS =
|
||||
env.CPPFLAGS = toString (
|
||||
lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "-Wno-error=vla-cxx-extension" ];
|
||||
++ lib.optionals stdenv.isDarwin [ "-Wno-error=vla-cxx-extension" ]
|
||||
);
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rockchip-linux/rkdeveloptool";
|
||||
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
# see https://bugs.gentoo.org/925275
|
||||
CPPFLAGS = "-fpermissive";
|
||||
env.CPPFLAGS = "-fpermissive";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user