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

vulkan-loader, pkg-config: Fix MinGWW64 Builds

Changed files
+8 -4
pkgs
development
libraries
vulkan-loader
tools
misc
pkg-config
+2 -2
pkgs/development/libraries/vulkan-loader/default.nix
···
nativeBuildInputs = [ cmake pkg-config ];
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" ]
++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
···
meta = with lib; {
description = "LunarG Vulkan loader";
homepage = "https://www.lunarg.com";
-
platforms = platforms.unix;
+
platforms = platforms.unix ++ platforms.windows;
license = licenses.asl20;
maintainers = [ maintainers.ralith ];
broken = (version != vulkan-headers.version);
+6 -2
pkgs/development/tools/misc/pkg-config/default.nix
···
"ac_cv_func_posix_getgrgid_r=yes"
];
-
# Silence "incompatible integer to pointer conversion passing 'gsize'" when building with Clang.
-
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion";
+
env.NIX_CFLAGS_COMPILE = toString (
+
# Silence "incompatible integer to pointer conversion passing 'gsize'" when building with Clang.
+
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;
doCheck = true;