Unverified Commit 776664d0 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

vulkan-loader, pkg-config: Fix MinGWW64 Builds
parents ab1da0d9 a0efdd21

pkgs/development/libraries/vulkan-loader/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec { 


  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"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec { 
  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);

pkgs/development/tools/misc/pkg-config/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -35,8 +35,12 @@ stdenv.mkDerivation rec { 
         "ac_cv_func_posix_getgrgid_r=yes"

       ];



  env.NIX_CFLAGS_COMPILE = toString (

    # 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;

  doCheck = true;