push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,14 @@
diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
index 153815577..584b15273 100644
--- a/loader/vulkan.pc.in
+++ b/loader/vulkan.pc.in
@@ -1,7 +1,5 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR_PC@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR_PC@
+libdir=@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_INCLUDEDIR@
Name: @CMAKE_PROJECT_NAME@
Description: Vulkan Loader

View File

@@ -0,0 +1,85 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
libX11,
libxcb,
libXrandr,
wayland,
moltenvk,
vulkan-headers,
addDriverRunpath,
enableX11 ? stdenv.hostPlatform.isLinux,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vulkan-loader";
version = "1.4.321.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Loader";
rev = "vulkan-sdk-${finalAttrs.version}";
hash = "sha256-i06il1GRkjSlhY36XpIUCcd1Wy+If+Eennzbb//1dzk=";
};
patches = [ ./fix-pkgconfig.patch ];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
vulkan-headers
]
++ lib.optionals enableX11 [
libX11
libxcb
libXrandr
]
++ lib.optionals stdenv.hostPlatform.isLinux [
wayland
];
cmakeFlags = [
"-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include"
(lib.cmakeBool "BUILD_WSI_XCB_SUPPORT" enableX11)
(lib.cmakeBool "BUILD_WSI_XLIB_SUPPORT" enableX11)
]
++ lib.optional stdenv.hostPlatform.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
++ lib.optional stdenv.hostPlatform.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share"
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF";
outputs = [
"out"
"dev"
];
doInstallCheck = true;
installCheckPhase = ''
grep -q "${vulkan-headers}/include" $dev/lib/pkgconfig/vulkan.pc || {
echo vulkan-headers include directory not found in pkg-config file
exit 1
}
'';
passthru = {
tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
};
};
meta = with lib; {
description = "LunarG Vulkan loader";
homepage = "https://www.lunarg.com";
platforms = platforms.unix ++ platforms.windows;
license = licenses.asl20;
maintainers = [ maintainers.ralith ];
broken = finalAttrs.version != vulkan-headers.version;
pkgConfigModules = [ "vulkan" ];
};
})