diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-29 11:58:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-29 11:58:56 +0000 |
| commit | f374e8c8dc413229f80756699377f1cceea4de5b (patch) | |
| tree | f0c07427fd245591a8b9778e5be3a2e699d31c17 /pkgs/development/libraries | |
| parent | 2853d3c2d146dd4d5434f130f5cd69f2cb26c3dd (diff) | |
| parent | 51b73b63202af2eb4c71e3019c1e42d69cdf18e0 (diff) | |
| download | nixpkgs-f374e8c8dc413229f80756699377f1cceea4de5b.tar nixpkgs-f374e8c8dc413229f80756699377f1cceea4de5b.tar.gz nixpkgs-f374e8c8dc413229f80756699377f1cceea4de5b.tar.bz2 nixpkgs-f374e8c8dc413229f80756699377f1cceea4de5b.tar.lz nixpkgs-f374e8c8dc413229f80756699377f1cceea4de5b.tar.xz nixpkgs-f374e8c8dc413229f80756699377f1cceea4de5b.tar.zst nixpkgs-f374e8c8dc413229f80756699377f1cceea4de5b.zip | |
Merge pull request #131299 from expipiplus1/vulkan-182
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/vulkan-headers/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/vulkan-loader/default.nix | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index f065b83bcc8..e9b9112c8fd 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.2.162.0"; + version = "1.2.182.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "057c49w1138l02v9gqsk1z8wdz0iilp96jblnldycwm9jc1a1ipq"; + sha256 = "03j0kzq2qxhy0y82l10m8am26zrms2sjrdb1dcbpv9zh5vkxhcla"; }; meta = with lib; { 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" ]; |