Unverified Commit f29194bf authored Nov 07, 2023 by Weijia Wang Committed by GitHub Nov 07, 2023

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

cogl, clutter: fix build with clang 16

parents 8411eeb8 1f8573a0

pkgs/development/libraries/clutter/default.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,10 @@ stdenv.mkDerivation rec {
		"--enable-quartz-backend=yes"
		];

		env = lib.optionalAttrs stdenv.cc.isClang {
		NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
		};

		#doCheck = true; # no tests possible without a display

		passthru = {

pkgs/development/libraries/cogl/default.nix

+9 −5

Original line number	Diff line number	Diff line
		@@ -85,11 +85,15 @@ stdenv.mkDerivation rec {
		buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ]
		++ lib.optionals stdenv.isDarwin [ OpenGL ];

		env = {
		COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [
		"-I${pango.dev}/include/pango-1.0"
		"-I${cairo.dev}/include/cairo"
		"-I${harfbuzz.dev}/include/harfbuzz"
		]);
		} // lib.optionalAttrs stdenv.cc.isClang {
		NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
		};

		#doCheck = true; # all tests fail (no idea why)