Unverified Commit c3a8e83c authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #305508 from SuperSamus/shaderc-update 

shaderc: 2023.8 -> 2024.0
parents 275148e6 ce1a7e51

pkgs/development/compilers/shaderc/default.nix

+9 −9
Original line number Diff line number Diff line
@@ -8,25 +8,25 @@ let 
  glslang = fetchFromGitHub {

    owner = "KhronosGroup";

    repo = "glslang";

    rev = "a91631b260cba3f22858d6c6827511e636c2458a";

    hash = "sha256-7kIIU45pe+IF7lGltpIKSvQBmcXR+TWFvmx7ztMNrpc=";

    rev = "6be56e45e574b375d759b89dad35f780bbd4792f";

    hash = "sha256-tktdsj4sxwQHBavHzu1x8H28RrIqSQs/fp2TQcVCm2g=";

  };

  spirv-tools = fetchFromGitHub {

    owner = "KhronosGroup";

    repo = "SPIRV-Tools";

    rev = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc";

    hash = "sha256-RzGvoDt1Qc+f6mZsfs99MxX4YB3yFc5FP92Yx/WGrsI=";

    rev = "360d469b9eac54d6c6e20f609f9ec35e3a5380ad";

    hash = "sha256-Bned5Pa6zCFByfNvqD0M5t3l4uAJYkDlpe6wu8e7a3U=";

  };

  spirv-headers = fetchFromGitHub {

    owner = "KhronosGroup";

    repo = "SPIRV-Headers";

    rev = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3";

    hash = "sha256-/I9dJlBE0kvFvqooKuqMETtOE72Jmva3zIGnq0o4+aE=";

    rev = "4183b260f4cccae52a89efdfcdd43c4897989f42";

    hash = "sha256-RKjw3H1z02bl6730xsbo38yjMaOCsHZP9xJOQbmWpnw=";

  };

in

stdenv.mkDerivation rec {

  pname = "shaderc";

  version = "2023.8";

  version = "2024.0";



  outputs = [ "out" "lib" "bin" "dev" "static" ];
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec { 
    owner = "google";

    repo = "shaderc";

    rev = "v${version}";

    hash = "sha256-c8mJ361DY2VlSFZ4/RCrV+nqB9HblbOdfMkI4cM1QzM=";

    hash = "sha256-Cwp7WbaKWw/wL9m70wfYu47xoUGQW+QGeoYhbyyzstQ=";

  };



  patchPhase = ''

  postPatch = ''

    cp -r --no-preserve=mode ${glslang} third_party/glslang

    cp -r --no-preserve=mode ${spirv-tools} third_party/spirv-tools

    ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers