mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-13 16:07:30 +03:00
Merge pull request #265971 from wegank/cogl-clang-16
cogl, clutter: fix build with clang 16
This commit is contained in:
commit
f29194bf3e
@ -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 = {
|
||||
|
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user