git.iko.soy/typeable/nixpkgs
on master help sign in
vulkan: 1.2.141 -> 1.2.162

Also improve metadata for vulkan-validation-layers

commitcbc4bd99716ff751df18b7b1abc55e069d5f1cd0 authorJoe Hermaszewski <git@monoid.al> dateTue 15 Dec 2020, 11:59 (6 years ago) parent918031c
5 files changed+33−30
pkgs/development/libraries/vulkan-headers/default.nix+2−2 pkgs/development/libraries/vulkan-loader/default.nix+2−2 pkgs/development/tools/vulkan-validation-layers/default.nix+18−16 pkgs/tools/graphics/vulkan-tools-lunarg/default.nix+9−8 pkgs/tools/graphics/vulkan-tools/default.nix+2−2
pkgs/development/libraries/vulkan-headers/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, cmake }:
22stdenv.mkDerivation rec {
33 pname = "vulkan-headers";
4− version = "1.2.141.0";
4+ version = "1.2.162.0";
55
66 nativeBuildInputs = [ cmake ];
77
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 owner = "KhronosGroup";
1010 repo = "Vulkan-Headers";
1111 rev = "sdk-${version}";
12− sha256 = "10nmx6y4llllfcczyfz76amd0vkqv09dj952d19zkzmmgcval7zq";
12+ sha256 = "057c49w1138l02v9gqsk1z8wdz0iilp96jblnldycwm9jc1a1ipq";
1313 };
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/vulkan-loader/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "vulkan-loader";
6− version = "1.2.141.0";
6+ version = "1.2.162.0";
77
88 src = fetchFromGitHub {
99 owner = "KhronosGroup";
1010 repo = "Vulkan-Loader";
1111 rev = "sdk-${version}";
12− sha256 = "10fyg71dza6qakz5zdchccfn0zcr8b1zpfi2rqir6jpzcbi28kcj";
12+ sha256 = "0w9i2pliw4ccmjyfzff4i2f3hxwsfd54jg7ahv2v634qmx59bsbi";
1313 };
1414
1515 nativeBuildInputs = [ pkgconfig cmake ];
pkgs/development/tools/vulkan-validation-layers/default.nix+18−16
@@ -20,36 +20,37 @@
2020# https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json
2121
2222let
23+ localSpirvHeaders = spirv-headers.overrideAttrs (_: {
24+ src = fetchFromGitHub {
25+ owner = "KhronosGroup";
26+ repo = "SPIRV-Headers";
27+ rev = "f027d53ded7e230e008d37c8b47ede7cd308e19d";
28+ sha256 = "12gp2mqcar6jj57jw9isfr62yn72kmvdcl0zga4gvrlyfhnf582q";
29+ };
30+ });
2331 localGlslang = (glslang.override {
2432 argSpirv-tools = spirv-tools.overrideAttrs (_: {
2533 src = fetchFromGitHub {
2634 owner = "KhronosGroup";
2735 repo = "SPIRV-Tools";
28− rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a";
29− sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv";
30− };
31− });
32− argSpirv-headers = spirv-headers.overrideAttrs (_: {
33− src = fetchFromGitHub {
34− owner = "KhronosGroup";
35− repo = "SPIRV-Headers";
36− rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be";
37− sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx";
36+ rev = "c9c1f54330d13a0bec1aa3f08d436249d8e35596";
37+ sha256 = "0r5whsw9x8j4199xwxv293ar2ga73pm2s7rngw732ylh6rw3bkly";
3838 };
3939 });
40+ argSpirv-headers = localSpirvHeaders;
4041 }).overrideAttrs (_: {
4142 src = fetchFromGitHub {
4243 owner = "KhronosGroup";
4344 repo = "glslang";
44− rev = "e00d27c6d65b7d3e72506a311d7f053da4051295";
45− sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv";
45+ rev = "dd69df7f3dac26362e10b0f38efb9e47990f7537";
46+ sha256 = "1iafbh524avsjg4pjiq156b62pck2rwlfl2pjnml8sjy285506rk";
4647 };
4748 });
4849in
4950
5051stdenv.mkDerivation rec {
5152 pname = "vulkan-validation-layers";
52− version = "1.2.141.0";
53+ version = "1.2.162.0";
5354
5455 # If we were to use "dev" here instead of headers, the setupHook would be
5556 # placed in that output instead of "out".
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
6061 owner = "KhronosGroup";
6162 repo = "Vulkan-ValidationLayers";
6263 rev = "sdk-${version}";
63− sha256 = "1yfas7q122kx74nbjk3wxlyacysgncvlvq081a5dp238m88vkmbj";
64+ sha256 = "1mpqmxh9zm20jdar59lp4yjpqfzxn2pwds6bkvnzihfy0pymf15k";
6465 };
6566
6667 nativeBuildInputs = [
@@ -83,6 +84,7 @@ stdenv.mkDerivation rec {
8384
8485 cmakeFlags = [
8586 "-DGLSLANG_INSTALL_DIR=${localGlslang}"
87+ "-DSPIRV_HEADERS_INSTALL_DIR=${localSpirvHeaders}"
8688 "-DBUILD_LAYER_SUPPORT_FILES=ON"
8789 ];
8890
@@ -98,8 +100,8 @@ stdenv.mkDerivation rec {
98100 '';
99101
100102 meta = with stdenv.lib; {
101− description = "LunarG Vulkan loader";
102− homepage = "https://www.lunarg.com";
103+ description = "The official Khronos Vulkan validation layers";
104+ homepage = "https://github.com/KhronosGroup/Vulkan-ValidationLayers";
103105 platforms = platforms.linux;
104106 license = licenses.asl20;
105107 maintainers = [ maintainers.ralith ];
pkgs/tools/graphics/vulkan-tools-lunarg/default.nix+9−8
@@ -6,15 +6,16 @@
66stdenv.mkDerivation rec {
77 pname = "vulkan-tools-lunarg";
88 # The version must match that in vulkan-headers
9− version = "1.2.141.0";
9+ version = "1.2.162.0";
1010
11− src = (assert version == vulkan-headers.version; fetchFromGitHub {
12− owner = "LunarG";
13− repo = "VulkanTools";
14− rev = "sdk-${version}";
15− sha256 = "1zsgc1hdmivdahzrarx7a5byhgnmm5ahz366l92fmdb8pffgq42g";
16− fetchSubmodules = true;
17− });
11+ src = (assert version == vulkan-headers.version;
12+ fetchFromGitHub {
13+ owner = "LunarG";
14+ repo = "VulkanTools";
15+ rev = "sdk-${version}";
16+ sha256 = "13v4202bfd7d7nwi8w12ja9k1vi10p9xxypzkpi063hmsgzxm5k5";
17+ fetchSubmodules = true;
18+ });
1819
1920 nativeBuildInputs = [ cmake pkgconfig python3 jq ];
2021
pkgs/tools/graphics/vulkan-tools/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "vulkan-tools";
7− version = "1.2.141.0";
7+ version = "1.2.162.0";
88
99 src = fetchFromGitHub {
1010 owner = "KhronosGroup";
1111 repo = "Vulkan-Tools";
1212 rev = "sdk-${version}";
13− sha256 = "1ch56ihm7rmilipfyc4i4ww7l6i20fb3qikkpm1ch43kzn42zjaw";
13+ sha256 = "088vqh956zma3p1qc3p6rsygf5s395b6cv8b1x0whp2a0a1y81xz";
1414 };
1515
1616 nativeBuildInputs = [ cmake pkgconfig ];