@@ -9094,24 +9094,7 @@ in
90949094
90959095 dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
90969096
9097− glslang = callPackage ../development/compilers/glslang {
9098− spirv-tools = spirv-tools.overrideAttrs (_: {
9099− src = fetchFromGitHub {
9100− owner = "KhronosGroup";
9101− repo = "SPIRV-Tools";
9102− rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9";
9103− sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";
9104− };
9105− });
9106− spirv-headers = spirv-headers.overrideAttrs (_: {
9107− src = fetchFromGitHub {
9108− owner = "KhronosGroup";
9109− repo = "SPIRV-Headers";
9110− rev = "f8bf11a0253a32375c32cad92c841237b96696c0";
9111− sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l";
9112− };
9113− });
9114− };
9097+ glslang = callPackage ../development/compilers/glslang { };
91159098
91169099 go_bootstrap = if stdenv.isAarch64 then
91179100 srcOnly {
@@ -15818,33 +15801,7 @@ in
1581815801 vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
1581915802 vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
1582015803 vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };
15821− vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers {
15822− glslang = (glslang.override {
15823− spirv-tools = spirv-tools.overrideAttrs (_: {
15824− src = fetchFromGitHub {
15825− owner = "KhronosGroup";
15826− repo = "SPIRV-Tools";
15827− rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a";
15828− sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv";
15829− };
15830− });
15831− spirv-headers = spirv-tools.overrideAttrs (_: {
15832− src = fetchFromGitHub {
15833− owner = "KhronosGroup";
15834− repo = "SPIRV-Headers";
15835− rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be";
15836− sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx";
15837− };
15838− });
15839− }).overrideAttrs (_: {
15840− src = fetchFromGitHub {
15841− owner = "KhronosGroup";
15842− repo = "glslang";
15843− rev = "e00d27c6d65b7d3e72506a311d7f053da4051295";
15844− sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv";
15845− };
15846− });
15847− };
15804+ vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
1584815805
1584915806 vtkWithQt5 = vtk.override { qtLib = qt514; };
1585015807