commit 0826f2efaed5c64d3c574f87dd4dcf978207f576 · pyrox.dev/nixpkgs

+36 -6

pkgs/development/compilers/glslang/default.nix

···

       5
       5
        
       , python3

     

       6
       6
        
       , spirv-headers

     

       7
       7
        
       , spirv-tools

     

       8
       8
       +
       , argSpirv-tools ? null

     

       9
       9
       +
       , argSpirv-headers ? null

     

       8
       10
        
       }:

     

       11
       11
       +
       # glslang requires custom versions of spirv-tools and spirb-headers.

     

       12
       12
       +
       # The exact versions are taken from:

     

       13
       13
       +
       # https://github.com/KhronosGroup/glslang/blob/master/known_good.json

     

       14
       14
       +
       

     

       15
       15
       +
       let

     

       16
       16
       +
         localSpirv-tools = if argSpirv-tools == null

     

       17
       17
       +
           then spirv-tools.overrideAttrs (_: {

     

       18
       18
       +
             src = fetchFromGitHub {

     

       19
       19
       +
               owner = "KhronosGroup";

     

       20
       20
       +
               repo = "SPIRV-Tools";

     

       21
       21
       +
               rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9";

     

       22
       22
       +
               sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";

     

       23
       23
       +
             };

     

       24
       24
       +
           })

     

       25
       25
       +
           else argSpirv-tools;

     

       26
       26
       +
       

     

       27
       27
       +
         localSpirv-headers = if argSpirv-headers == null

     

       28
       28
       +
           then spirv-headers.overrideAttrs (_: {

     

       29
       29
       +
             src = fetchFromGitHub {

     

       30
       30
       +
               owner = "KhronosGroup";

     

       31
       31
       +
               repo = "SPIRV-Headers";

     

       32
       32
       +
               rev = "f8bf11a0253a32375c32cad92c841237b96696c0";

     

       33
       33
       +
               sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l";

     

       34
       34
       +
             };

     

       35
       35
       +
           })

     

       36
       36
       +
           else argSpirv-headers;

     

       37
       37
       +
       in

     

       9
       38
        
       

     

       10
       39
        
       stdenv.mkDerivation rec {

     

       11
       40
        
         pname = "glslang";

     

       12
       12
       -
         version = "8.13.3559";

     

       41
       41
       +
         version = "8.13.3743";

     

       13
       42
        
       

     

       14
       43
        
         src = fetchFromGitHub {

     

       15
       44
        
           owner = "KhronosGroup";

     

       16
       45
        
           repo = "glslang";

     

       17
       46
        
           rev = version;

     

       18
       18
       -
           sha256 = "0waamlh2vqh1k40m169294xdlm0iqjkx2vis4qyxfki0r0cnsmnk";

     

       47
       47
       +
           sha256 = "0d20wfpp2fmbnz1hnsjr9xc62lxpj86ik2qyviqbni0pqj212cry";

     

       19
       48
        
         };

     

       20
       49
        
       

     

       21
       50
        
         # These get set at all-packages, keep onto them for child drvs

     

       22
       51
        
         passthru = {

     

       23
       23
       -
           inherit spirv-tools spirv-headers;

     

       52
       52
       +
           spirv-tools = localSpirv-tools;

     

       53
       53
       +
           spirv-headers = localSpirv-headers;

     

       24
       54
        
         };

     

       25
       55
        
       

     

       26
       56
        
         nativeBuildInputs = [ cmake python3 bison jq ];

     

       27
       57
        
         enableParallelBuilding = true;

     

       28
       58
        
       

     

       29
       59
        
         postPatch = ''

     

       30
       30
       -
           cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools

     

       31
       31
       -
           ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers

     

       60
       60
       +
           cp --no-preserve=mode -r "${localSpirv-tools.src}" External/spirv-tools

     

       61
       61
       +
           ln -s "${localSpirv-headers.src}" External/spirv-tools/external/spirv-headers

     

       32
       62
        
         '';

     

       33
       63
        
       

     

       34
       64
        
         # Ensure spirv-headers and spirv-tools match exactly to what is expected

     

       35
       65
        
         preConfigure = ''

     

       36
       66
        
           HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit')

     

       37
       67
        
           TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit')

     

       38
       38
       -
           if [ "$HEADERS_COMMIT" != "${spirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then

     

       68
       68
       +
           if [ "$HEADERS_COMMIT" != "${localSpirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${localSpirv-tools.src.rev}" ]; then

     

       39
       69
        
             echo "ERROR: spirv-tools commits do not match expected versions: expected tools at $TOOLS_COMMIT, headers at $HEADERS_COMMIT";

     

       40
       70
        
             exit 1;

     

       41
       71
        
           fi

+8 -8

pkgs/development/compilers/shaderc/default.nix

···

       8
       8
        
         glslang = fetchFromGitHub {

     

       9
       9
        
           owner = "KhronosGroup";

     

       10
       10
        
           repo = "glslang";

     

       11
       11
       -
           rev = "3ed344dd784ecbbc5855e613786f3a1238823e56";

     

       12
       12
       -
           sha256 = "00s2arfvw78d9k9fmangqlkvkmkpqzrin3g91vfab4wr8srb09dx";

     

       11
       11
       +
           rev = "3ee5f2f1d3316e228916788b300d786bb574d337";

     

       12
       12
       +
           sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv";

     

       13
       13
        
         };

     

       14
       14
        
         spirv-tools = fetchFromGitHub {

     

       15
       15
        
           owner = "KhronosGroup";

     

       16
       16
        
           repo = "SPIRV-Tools";

     

       17
       17
       -
           rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6";

     

       18
       18
       -
           sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv";

     

       17
       17
       +
           rev = "b63f0e5ed3e818870968ebf6af73317127fd07b0";

     

       18
       18
       +
           sha256 = "1chv30azfp76nha428ivg4ixrij6d8pxj5kn3jam87gmkmgc9zhm";

     

       19
       19
        
         };

     

       20
       20
        
         spirv-headers = fetchFromGitHub {

     

       21
       21
        
           owner = "KhronosGroup";

     

       22
       22
        
           repo = "SPIRV-Headers";

     

       23
       23
       -
           rev = "204cd131c42b90d129073719f2766293ce35c081";

     

       24
       24
       -
           sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";

     

       23
       23
       +
           rev = "979924c8bc839e4cb1b69d03d48398551f369ce7";

     

       24
       24
       +
           sha256 = "07vyjlblpm4zhfds612h86lnz0qvrj5qqw5z2zzfa3m9fax7cm85";

     

       25
       25
        
         };

     

       26
       26
        
       in stdenv.mkDerivation rec {

     

       27
       27
        
         pname = "shaderc";

     

       28
       28
       -
         version = "2019.1";

     

       28
       28
       +
         version = "2020.2";

     

       29
       29
        
       

     

       30
       30
        
         outputs = [ "out" "lib" "bin" "dev" "static" ];

     

       31
       31
        
       

     
···

       33
       33
        
           owner = "google";

     

       34
       34
        
           repo = "shaderc";

     

       35
       35
        
           rev = "v${version}";

     

       36
       36
       -
           sha256 = "0x514rpignnb4vvl7wmijfakqc59986knjw3dh1zx0ah42xa7x37";

     

       36
       36
       +
           sha256 = "1sxz8872x3rdlrhmbn83r1vniq4j51jnk0ka3447fq68il4myf1w";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         patchPhase = ''

+2 -2

pkgs/development/libraries/spirv-headers/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "spirv-headers";

     

       5
       5
       -
         version = "1.5.1";

     

       5
       5
       +
         version = "1.5.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "KhronosGroup";

     

       9
       9
        
           repo = "SPIRV-Headers";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "1fnd8qwss6pxcch5j9qi1pdz70828zxsg4m8apgrhyj0p9lm0rbg";

     

       11
       11
       +
           sha256 = "069sivqajp7z4p44lmrz23lvf237xpkjxd4lzrg27836pwqcz9bj";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/development/libraries/vulkan-headers/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, cmake }:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
        
         pname = "vulkan-headers";

     

       4
       4
       -
         version = "1.2.131.1";

     

       4
       4
       +
         version = "1.2.141.0";

     

       5
       5
        
       

     

       6
       6
        
         nativeBuildInputs = [ cmake ];

     

       7
       7
        
       

     
···

       9
       9
        
           owner = "KhronosGroup";

     

       10
       10
        
           repo = "Vulkan-Headers";

     

       11
       11
        
           rev = "sdk-${version}";

     

       12
       12
       -
           sha256 = "1yf42c2cnhx1y4wkxsdl6g653xl2vvamhpkldz6jb4ca5wk03gxf";

     

       12
       12
       +
           sha256 = "10nmx6y4llllfcczyfz76amd0vkqv09dj952d19zkzmmgcval7zq";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

+2 -2

pkgs/development/libraries/vulkan-loader/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "vulkan-loader";

     

       6
       6
       -
         version = "1.2.131.2";

     

       6
       6
       +
         version = "1.2.141.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "KhronosGroup";

     

       10
       10
        
           repo = "Vulkan-Loader";

     

       11
       11
        
           rev = "sdk-${version}";

     

       12
       12
       -
           sha256 = "12n4mxc6db89258k8i47ql1zna7k94lkwv7lpxg39nm8ypa1ywrv";

     

       12
       12
       +
           sha256 = "10fyg71dza6qakz5zdchccfn0zcr8b1zpfi2rqir6jpzcbi28kcj";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig cmake ];

+2 -2

pkgs/development/tools/spirv-tools/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, cmake, python3, spirv-headers }:

     

       2
       2
        
       let

     

       3
       3
        
         # Update spirv-headers rev in lockstep according to DEPs file

     

       4
       4
       -
         version = "2019.4";

     

       4
       4
       +
         version = "2020.2";

     

       5
       5
        
       in

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     
···

       12
       12
        
           owner = "KhronosGroup";

     

       13
       13
        
           repo = "SPIRV-Tools";

     

       14
       14
        
           rev = "v${version}";

     

       15
       15
       -
           sha256 = "17bbvhk4p42x4jlvcr5p9903xiiryw57c8yyfxmqik10s8601an9";

     

       15
       15
       +
           sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";

     

       16
       16
        
         };

     

       17
       17
        
         enableParallelBuilding = true;

     

       18
       18

+69 -8

pkgs/development/tools/vulkan-validation-layers/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, writeText, python3

     

       2
       2
       -
       , vulkan-headers, vulkan-loader, glslang

     

       3
       3
       -
       , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , cmake

     

       4
       4
       +
       , writeText

     

       5
       5
       +
       , python3

     

       6
       6
       +
       , spirv-headers

     

       7
       7
       +
       , spirv-tools

     

       8
       8
       +
       , vulkan-headers

     

       9
       9
       +
       , vulkan-loader

     

       10
       10
       +
       , glslang

     

       11
       11
       +
       , pkgconfig

     

       12
       12
       +
       , xlibsWrapper

     

       13
       13
       +
       , libxcb

     

       14
       14
       +
       , libXrandr

     

       15
       15
       +
       , wayland

     

       16
       16
       +
       }:

     

       17
       17
       +
       # vulkan-validation-layers requires a custom glslang version, while glslang requires

     

       18
       18
       +
       # custom versions for spirv-tools and spirv-headers. The git hashes required for all

     

       19
       19
       +
       # of these deps is documented upstream here:

     

       20
       20
       +
       # https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json

     

       21
       21
       +
       

     

       22
       22
       +
       let

     

       23
       23
       +
         localGlslang = (glslang.override {

     

       24
       24
       +
           argSpirv-tools = spirv-tools.overrideAttrs (_: {

     

       25
       25
       +
             src = fetchFromGitHub {

     

       26
       26
       +
               owner = "KhronosGroup";

     

       27
       27
       +
               repo = "SPIRV-Tools";

     

       28
       28
       +
               rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a";

     

       29
       29
       +
               sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv";

     

       30
       30
       +
             };

     

       31
       31
       +
           });

     

       32
       32
       +
           argSpirv-headers = spirv-headers.overrideAttrs (_: {

     

       33
       33
       +
             src = fetchFromGitHub {

     

       34
       34
       +
               owner = "KhronosGroup";

     

       35
       35
       +
               repo = "SPIRV-Headers";

     

       36
       36
       +
               rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be";

     

       37
       37
       +
               sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx";

     

       38
       38
       +
             };

     

       39
       39
       +
           });

     

       40
       40
       +
         }).overrideAttrs (_: {

     

       41
       41
       +
           src = fetchFromGitHub {

     

       42
       42
       +
             owner = "KhronosGroup";

     

       43
       43
       +
             repo = "glslang";

     

       44
       44
       +
             rev = "e00d27c6d65b7d3e72506a311d7f053da4051295";

     

       45
       45
       +
             sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv";

     

       46
       46
       +
           };

     

       47
       47
       +
         });

     

       48
       48
       +
       in

     

       4
       49
        
       

     

       5
       50
        
       stdenv.mkDerivation rec {

     

       6
       51
        
         pname = "vulkan-validation-layers";

     

       7
       7
       -
         version = "1.2.131.2";

     

       52
       52
       +
         version = "1.2.141.0";

     

       8
       53
        
       

     

       9
       54
        
         src = fetchFromGitHub {

     

       10
       55
        
           owner = "KhronosGroup";

     

       11
       56
        
           repo = "Vulkan-ValidationLayers";

     

       12
       57
        
           rev = "sdk-${version}";

     

       13
       13
       -
           sha256 = "1sz0388cr018ldx6ziplvk4v3zbg44pww77kv6kv5wxl69plwfcn";

     

       58
       58
       +
           sha256 = "1yfas7q122kx74nbjk3wxlyacysgncvlvq081a5dp238m88vkmbj";

     

       14
       59
        
         };

     

       15
       60
        
       

     

       16
       16
       -
         nativeBuildInputs = [ pkgconfig cmake python3  ];

     

       17
       17
       -
         buildInputs = [ vulkan-headers vulkan-loader libxcb libXrandr wayland ];

     

       61
       61
       +
         nativeBuildInputs = [

     

       62
       62
       +
           pkgconfig

     

       63
       63
       +
           cmake

     

       64
       64
       +
           python3

     

       65
       65
       +
         ];

     

       66
       66
       +
       

     

       67
       67
       +
         buildInputs = [

     

       68
       68
       +
           localGlslang

     

       69
       69
       +
           localGlslang.spirv-headers

     

       70
       70
       +
           vulkan-headers

     

       71
       71
       +
           vulkan-loader

     

       72
       72
       +
           libxcb

     

       73
       73
       +
           libXrandr

     

       74
       74
       +
           wayland

     

       75
       75
       +
         ];

     

       76
       76
       +
       

     

       18
       77
        
         enableParallelBuilding = true;

     

       19
       78
        
       

     

       20
       20
       -
         cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ];

     

       79
       79
       +
         cmakeFlags = [

     

       80
       80
       +
           "-DGLSLANG_INSTALL_DIR=${localGlslang}"

     

       81
       81
       +
         ];

     

       21
       82
        
       

     

       22
       83
        
         # Help vulkan-loader find the validation layers

     

       23
       84
        
         setupHook = writeText "setup-hook" ''

+16 -5

pkgs/tools/graphics/vulkan-tools/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, vulkan-headers,

     

       2
       2
       -
         glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:

     

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, cmake, python3, vulkan-loader,

     

       2
       2
       +
        vulkan-headers, glslang, pkgconfig, xlibsWrapper, libxcb,

     

       3
       3
       +
        libXrandr, wayland }:

     

       3
       4
        
       

     

       4
       5
        
       stdenv.mkDerivation rec {

     

       5
       6
        
         pname = "vulkan-tools";

     

       6
       6
       -
         version = "1.2.131.1";

     

       7
       7
       +
         version = "1.2.141.0";

     

       7
       8
        
       

     

       8
       9
        
         src = fetchFromGitHub {

     

       9
       10
        
           owner = "KhronosGroup";

     

       10
       11
        
           repo = "Vulkan-Tools";

     

       11
       12
        
           rev = "sdk-${version}";

     

       12
       12
       -
           sha256 = "0ws47ansrr8cq4qjf6k4q0ygm9wwd3w7mhwqcl1qxms8lh5vmhfq";

     

       13
       13
       +
           sha256 = "1ch56ihm7rmilipfyc4i4ww7l6i20fb3qikkpm1ch43kzn42zjaw";

     

       13
       14
        
         };

     

       14
       15
        
       

     

       15
       16
        
         nativeBuildInputs = [ cmake pkgconfig ];

     

       16
       17
        
         buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ];

     

       17
       18
        
         enableParallelBuilding = true;

     

       18
       19
        
       

     

       19
       19
       -
         cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ];

     

       20
       20
       +
         libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];

     

       21
       21
       +
       

     

       22
       22
       +
         dontPatchELF = true;

     

       23
       23
       +
       

     

       24
       24
       +
         cmakeFlags = [

     

       25
       25
       +
           # Don't build the mock ICD as it may get used instead of other drivers, if installed

     

       26
       26
       +
           "-DBUILD_ICD=OFF"

     

       27
       27
       +
           "-DGLSLANG_INSTALL_DIR=${glslang}"

     

       28
       28
       +
           # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH

     

       29
       29
       +
           "-DCMAKE_INSTALL_RPATH=${libraryPath}"

     

       30
       30
       +
         ];

     

       20
       31
        
       

     

       21
       32
        
         meta = with stdenv.lib; {

     

       22
       33
        
           description = "LunarG Vulkan loader";

+2 -45

pkgs/top-level/all-packages.nix

···

       9094
       9094
        
       

     

       9095
       9095
        
         dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});

     

       9096
       9096
        
       

     

       9097
       9097
       -
         glslang = callPackage ../development/compilers/glslang {

     

       9098
       9098
       -
           spirv-tools = spirv-tools.overrideAttrs (_: {

     

       9099
       9099
       -
             src = fetchFromGitHub {

     

       9100
       9100
       -
               owner = "KhronosGroup";

     

       9101
       9101
       -
               repo = "SPIRV-Tools";

     

       9102
       9102
       -
               rev = "5c019b5923c1f6bf00a3ac28114ec4a7b1faa0e2";

     

       9103
       9103
       -
               sha256 = "17a0kiyb7zjsg7ws12diip84vds1ajl98ni9c2wria6ymcvbvsvz";

     

       9104
       9104
       -
             };

     

       9105
       9105
       -
           });

     

       9106
       9106
       -
           spirv-headers = spirv-headers.overrideAttrs (_: {

     

       9107
       9107
       -
             src = fetchFromGitHub {

     

       9108
       9108
       -
               owner = "KhronosGroup";

     

       9109
       9109
       -
               repo = "SPIRV-Headers";

     

       9110
       9110
       -
               rev = "204cd131c42b90d129073719f2766293ce35c081";

     

       9111
       9111
       -
               sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";

     

       9112
       9112
       -
             };

     

       9113
       9113
       -
           });

     

       9114
       9114
       -
         };

     

       9097
       9097
       +
         glslang = callPackage ../development/compilers/glslang { };

     

       9115
       9098
        
       

     

       9116
       9099
        
         go_bootstrap = if stdenv.isAarch64 then

     

       9117
       9100
        
           srcOnly {

     
···

       15884
       15867
        
         vulkan-headers = callPackage ../development/libraries/vulkan-headers { };

     

       15885
       15868
        
         vulkan-loader = callPackage ../development/libraries/vulkan-loader { };

     

       15886
       15869
        
         vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };

     

       15887
       15887
       -
         vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers {

     

       15888
       15888
       -
           glslang = (glslang.override {

     

       15889
       15889
       -
             spirv-tools = spirv-tools.overrideAttrs (_: {

     

       15890
       15890
       -
               src = fetchFromGitHub {

     

       15891
       15891
       -
                 owner = "KhronosGroup";

     

       15892
       15892
       -
                 repo = "SPIRV-Tools";

     

       15893
       15893
       -
                 rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6";

     

       15894
       15894
       -
                 sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv";

     

       15895
       15895
       -
               };

     

       15896
       15896
       -
             });

     

       15897
       15897
       -
             spirv-headers = spirv-tools.overrideAttrs (_: {

     

       15898
       15898
       -
               src = fetchFromGitHub {

     

       15899
       15899
       -
                 owner = "KhronosGroup";

     

       15900
       15900
       -
                 repo = "SPIRV-Headers";

     

       15901
       15901
       -
                 rev = "204cd131c42b90d129073719f2766293ce35c081";

     

       15902
       15902
       -
                 sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";

     

       15903
       15903
       -
               };

     

       15904
       15904
       -
             });

     

       15905
       15905
       -
           }).overrideAttrs (_: {

     

       15906
       15906
       -
             src = fetchFromGitHub {

     

       15907
       15907
       -
               owner = "KhronosGroup";

     

       15908
       15908
       -
               repo = "glslang";

     

       15909
       15909
       -
               rev = "4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3";

     

       15910
       15910
       -
               sha256 = "1dghz8zl774dx2xpa4dv8xhxirbylgyn6kx18ib4qirna1njp0zg";

     

       15911
       15911
       -
             };

     

       15912
       15912
       -
           });

     

       15913
       15913
       -
         };

     

       15870
       15870
       +
         vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };

     

       15914
       15871
        
       

     

       15915
       15872
        
         vtkWithQt5 = vtk.override { qtLib = qt514; };

     

       15916
       15873