cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #272607 from sambnt/vulkan-fix-mingw

Browse source 
vulkan-loader, pkg-config: Fix MinGWW64 Builds
This commit is contained in:
Weijia Wang 2023-12-07 19:08:09 +01:00 committed by GitHub
commit 776664d0cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/vulkan-loader/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ vulkan-headers ] buildInputs = [ vulkan-headers ]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ]; ++ lib.optionals stdenv.isLinux [ libX11 libxcb libXrandr wayland ];
cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]
++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "LunarG Vulkan loader"; description = "LunarG Vulkan loader";
homepage = "https://www.lunarg.com"; homepage = "https://www.lunarg.com";
platforms = platforms.unix; platforms = platforms.unix ++ platforms.windows;
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.ralith ]; maintainers = [ maintainers.ralith ];
broken = (version != vulkan-headers.version); broken = (version != vulkan-headers.version);

6
pkgs/development/tools/misc/pkg-config/default.nix
View file

@ -35,8 +35,12 @@ stdenv.mkDerivation rec {
"ac_cv_func_posix_getgrgid_r=yes" "ac_cv_func_posix_getgrgid_r=yes"
]; ];
env.NIX_CFLAGS_COMPILE = toString (
# Silence "incompatible integer to pointer conversion passing 'gsize'" when building with Clang. # Silence "incompatible integer to pointer conversion passing 'gsize'" when building with Clang.
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion"; lib.optionals stdenv.cc.isClang ["-Wno-int-conversion"]
# Silence fprintf format errors when building for Windows.
++ lib.optionals stdenv.hostPlatform.isWindows ["-Wno-error=format"]
);
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = true;