Skip to content

Commit

Permalink
vulkan-tools: 1.2.162.0 → 1.2.176.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kira-bruneau authored and expipiplus1 committed Jul 24, 2021
1 parent 7f02a73 commit 073b8ce
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions pkgs/tools/graphics/vulkan-tools/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
{ stdenv, lib, fetchFromGitHub, cmake, python3, vulkan-loader,
vulkan-headers, glslang, pkg-config, xlibsWrapper, libxcb,
libXrandr, wayland }:
{ stdenv, lib, fetchFromGitHub, cmake, glslang, libX11, libxcb
, libXrandr, vulkan-headers, vulkan-loader, wayland }:

stdenv.mkDerivation rec {
pname = "vulkan-tools";
version = "1.2.162.0";
version = "1.2.176.0";

src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Tools";
rev = "sdk-${version}";
sha256 = "088vqh956zma3p1qc3p6rsygf5s395b6cv8b1x0whp2a0a1y81xz";
sha256 = "15jkjn3ildam4ad2x0d8ysm3i2l6nrvqv0h44spkipf13bqiq5wg";
};

nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
nativeBuildInputs = [ cmake ];
buildInputs = [ glslang libX11 libxcb libXrandr vulkan-headers vulkan-loader wayland ];

libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];

Expand All @@ -23,9 +22,10 @@ stdenv.mkDerivation rec {
cmakeFlags = [
# Don't build the mock ICD as it may get used instead of other drivers, if installed
"-DBUILD_ICD=OFF"
"-DGLSLANG_INSTALL_DIR=${glslang}"
# vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
"-DCMAKE_INSTALL_RPATH=${libraryPath}"
# Hide dev warnings that are useless for packaging
"-Wno-dev"
];

meta = with lib; {
Expand Down

0 comments on commit 073b8ce

Please sign in to comment.