diff options
| author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-10-13 18:17:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 18:17:03 +0000 |
| commit | ea6fc49f0f02300742708ad1a202d8c0745507f9 (patch) | |
| tree | 21e3fadcfb8a940f1db5cdffead34e11b124316e | |
| parent | 6738033727ca7945f1465ad76492891489e133ce (diff) | |
| parent | d21881ca5af8769c1694fb93262f92cd181fa241 (diff) | |
| download | nixlib-ea6fc49f0f02300742708ad1a202d8c0745507f9.tar nixlib-ea6fc49f0f02300742708ad1a202d8c0745507f9.tar.gz nixlib-ea6fc49f0f02300742708ad1a202d8c0745507f9.tar.bz2 nixlib-ea6fc49f0f02300742708ad1a202d8c0745507f9.tar.lz nixlib-ea6fc49f0f02300742708ad1a202d8c0745507f9.tar.xz nixlib-ea6fc49f0f02300742708ad1a202d8c0745507f9.tar.zst nixlib-ea6fc49f0f02300742708ad1a202d8c0745507f9.zip | |
Merge pull request #48329 from transumption/201810/vulkan-loader-sha256
vulkan-{headers,loader}: lock revs, update sha256 after bump| -rw-r--r-- | pkgs/development/libraries/vulkan-headers/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/vulkan-loader/default.nix | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index dd3f14f91928..c93ba1b12909 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "sdk-${version}"; + rev = "2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0"; sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb"; }; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index ad110817fea1..6f720857f7cf 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, - xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: -let version = "1.1.85"; in +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig +, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: + +let + version = "1.1.85"; +in + assert version == vulkan-headers.version; stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; @@ -9,8 +13,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; - rev = "sdk-${version}"; - sha256 = "16i4s1adfh822ahj3ywp279lv6szwd2sn2q5pmvpg2kk6mbh410d"; + rev = "b02f64293680c484e1d7ff6ecb88f89277c0dc8c"; + sha256 = "1n4vjyxlmi2ygx34srwbvalc5gz95gcsrmdw0k10353xja755gmj"; }; nativeBuildInputs = [ pkgconfig ]; |