gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
cogl, clutter: fix build with clang 16
This commit is contained in:
Weijia Wang
2023-11-07 09:13:26 +01:00
committed by GitHub
parent 8411eeb838 1f8573a0bf
commit f29194bf3e
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/clutter/default.nix
+4
View File
@@ -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
View File
@@ -85,11 +85,15 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ]
++ lib.optionals stdenv.isDarwin [ OpenGL ];
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"
]);
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)