Merge pull request #265971 from wegank/cogl-clang-16

cogl, clutter: fix build with clang 16

authored by Weijia Wang and committed by GitHub f29194bf 8411eeb8

+13 -5
+4
pkgs/development/libraries/clutter/default.nix
··· 68 68 "--enable-quartz-backend=yes" 69 69 ]; 70 70 71 + env = lib.optionalAttrs stdenv.cc.isClang { 72 + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; 73 + }; 74 + 71 75 #doCheck = true; # no tests possible without a display 72 76 73 77 passthru = {
+9 -5
pkgs/development/libraries/cogl/default.nix
··· 85 85 buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ] 86 86 ++ lib.optionals stdenv.isDarwin [ OpenGL ]; 87 87 88 - COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ 89 - "-I${pango.dev}/include/pango-1.0" 90 - "-I${cairo.dev}/include/cairo" 91 - "-I${harfbuzz.dev}/include/harfbuzz" 92 - ]); 88 + env = { 89 + COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ 90 + "-I${pango.dev}/include/pango-1.0" 91 + "-I${cairo.dev}/include/cairo" 92 + "-I${harfbuzz.dev}/include/harfbuzz" 93 + ]); 94 + } // lib.optionalAttrs stdenv.cc.isClang { 95 + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; 96 + }; 93 97 94 98 #doCheck = true; # all tests fail (no idea why) 95 99