Unverified Commit fe160677 authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

treewide: move CPPFLAGS into env for structuredAttrs (#492209)

parents fab72b71 d4af80cb

pkgs/by-name/pd/pdnsd/package.nix

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

pkgs/by-name/pg/pgadmin4/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ pythonPackages.buildPythonApplication rec { 
  };



  # from Dockerfile

  CPPFLAGS = "-DPNG_ARM_NEON_OPT=0";

  env.CPPFLAGS = "-DPNG_ARM_NEON_OPT=0";



  format = "setuptools";

pkgs/by-name/rk/rkdeveloptool/package.nix

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

pkgs/by-name/so/sooperlooper/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  # see https://bugs.gentoo.org/925275

  CPPFLAGS = "-fpermissive";

  env.CPPFLAGS = "-fpermissive";



  enableParallelBuilding = true;