git.iko.soy/typeable/nixpkgs
on master help sign in
vulkan-tools: 1.2.131.1 -> 1.2.141.0
bda92bfCâju Mihai-Drosi
pkgs/tools/graphics/vulkan-tools/default.nix+16−5
@@ -1,22 +1,33 @@
1−{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, vulkan-headers,
1+{ stdenv, lib, fetchFromGitHub, cmake, python3, vulkan-loader,
2− glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
2+ vulkan-headers, glslang, pkgconfig, xlibsWrapper, libxcb,
3+ libXrandr, wayland }:
3
4
4stdenv.mkDerivation rec {
5stdenv.mkDerivation rec {
5 pname = "vulkan-tools";
6 pname = "vulkan-tools";
6− version = "1.2.131.1";
7+ version = "1.2.141.0";
7
8
8 src = fetchFromGitHub {
9 src = fetchFromGitHub {
9 owner = "KhronosGroup";
10 owner = "KhronosGroup";
10 repo = "Vulkan-Tools";
11 repo = "Vulkan-Tools";
11 rev = "sdk-${version}";
12 rev = "sdk-${version}";
12− sha256 = "0ws47ansrr8cq4qjf6k4q0ygm9wwd3w7mhwqcl1qxms8lh5vmhfq";
13+ sha256 = "1ch56ihm7rmilipfyc4i4ww7l6i20fb3qikkpm1ch43kzn42zjaw";
13 };
14 };
14
15
15 nativeBuildInputs = [ cmake pkgconfig ];
16 nativeBuildInputs = [ cmake pkgconfig ];
16 buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
17 buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
17 enableParallelBuilding = true;
18 enableParallelBuilding = true;
18
19
20+ libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];
21+
22+ dontPatchELF = true;
23+
24+ cmakeFlags = [
25+ # Don't build the mock ICD as it may get used instead of other drivers, if installed
26+ "-DBUILD_ICD=OFF"
19− cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ];
27+ "-DGLSLANG_INSTALL_DIR=${glslang}"
28+ # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
29+ "-DCMAKE_INSTALL_RPATH=${libraryPath}"
30+ ];
20
31
21 meta = with stdenv.lib; {
32 meta = with stdenv.lib; {
22 description = "LunarG Vulkan loader";
33 description = "LunarG Vulkan loader";