public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-01-03 12:24:59 +00:00
committed by GitHub
parent fb2311d430 93bf798c31
commit 0649757570
54 changed files with 4143 additions and 2702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
+9 -8
View File
@@ -6,15 +6,16 @@
stdenv.mkDerivation rec {
pname = "vulkan-tools-lunarg";
# The version must match that in vulkan-headers
version = "1.2.141.0";
version = "1.2.162.0";
src = (assert version == vulkan-headers.version; fetchFromGitHub {
owner = "LunarG";
repo = "VulkanTools";
rev = "sdk-${version}";
sha256 = "1zsgc1hdmivdahzrarx7a5byhgnmm5ahz366l92fmdb8pffgq42g";
fetchSubmodules = true;
});
src = (assert version == vulkan-headers.version;
fetchFromGitHub {
owner = "LunarG";
repo = "VulkanTools";
rev = "sdk-${version}";
sha256 = "13v4202bfd7d7nwi8w12ja9k1vi10p9xxypzkpi063hmsgzxm5k5";
fetchSubmodules = true;
});
nativeBuildInputs = [ cmake pkgconfig python3 jq ];
pkgs/tools/graphics/vulkan-tools/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "vulkan-tools";
version = "1.2.141.0";
version = "1.2.162.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Tools";
rev = "sdk-${version}";
sha256 = "1ch56ihm7rmilipfyc4i4ww7l6i20fb3qikkpm1ch43kzn42zjaw";
sha256 = "088vqh956zma3p1qc3p6rsygf5s395b6cv8b1x0whp2a0a1y81xz";
};
nativeBuildInputs = [ cmake pkgconfig ];