summary refs log tree commit diff
path: root/pkgs/development/libraries/vulkan-loader/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-08-04 10:54:22 +0000
committerAlyssa Ross <hi@alyssa.is>2021-08-04 10:54:22 +0000
commitd2e147bedf251976ed99b94b6c905d6761f7a892 (patch)
tree9e0c62d61698916fd4627ed98d3d880c8fc0ab2e /pkgs/development/libraries/vulkan-loader/default.nix
parent62614cbef7da005c1eda8c9400160f6bcd6546b8 (diff)
parentc464dc811babfe316ed4ab7bbc12351122e69dd7 (diff)
downloadnixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.gz
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.bz2
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.lz
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.xz
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.zst
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.zip
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into master
Diffstat (limited to 'pkgs/development/libraries/vulkan-loader/default.nix')
-rw-r--r--pkgs/development/libraries/vulkan-loader/default.nix24
1 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index b3882a91942..21239b9b436 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,23 +1,23 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkg-config
-, xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb
+, libXrandr, wayland, vulkan-headers, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
   pname = "vulkan-loader";
-  version = "1.2.162.0";
+  version = "1.2.182.0";
 
-  src = fetchFromGitHub {
-    owner = "KhronosGroup";
-    repo = "Vulkan-Loader";
-    rev = "sdk-${version}";
-    sha256 = "0w9i2pliw4ccmjyfzff4i2f3hxwsfd54jg7ahv2v634qmx59bsbi";
-  };
+  src = (assert version == vulkan-headers.version;
+    fetchFromGitHub {
+      owner = "KhronosGroup";
+      repo = "Vulkan-Loader";
+      rev = "sdk-${version}";
+      sha256 = "0gmr9q3a6s8xvaa74fs9zbi9c305i2b3rx768qvl79nhbdj8nc02";
+    });
 
-  nativeBuildInputs = [ pkg-config cmake ];
-  buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ];
 
   cmakeFlags = [
     "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
-    "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
     "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include"
   ];