Unverified Commit f3610b36 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #196763 from reckenrode/moltenvk-bump

parents 9ee8c10e edad2ee5

pkgs/os-specific/darwin/moltenvk/default.nix

+12 −12
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "MoltenVK";

  version = "1.1.11";

  version = "1.2.0";



  buildInputs = [ AppKit Foundation Metal QuartzCore cereal ]

    ++ lib.attrValues finalAttrs.passthru;
@@ -39,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: { 
      src = fetchFromGitHub {

        owner = "KhronosGroup";

        repo = "glslang";

        rev = "73c9630da979017b2f7e19c6549e2bdb93d9b238";

        hash = "sha256-+NKp/4e3iruAcTunpxksvCHxoVYmPd0kFI8JDJJUVg4=";

        rev = "5755de46b07e4374c05fb1081f65f7ae1f8cca81";

        hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk=";

      };

    })).override { inherit (finalAttrs.passthru) spirv-headers spirv-tools; };

    spirv-cross = spirv-cross.overrideAttrs (old: {
@@ -49,32 +49,32 @@ stdenv.mkDerivation (finalAttrs: { 
      src = fetchFromGitHub {

        owner = "KhronosGroup";

        repo = "SPIRV-Cross";

        rev = "61c603f3baa5270e04bcfb6acf83c654e3c57679";

        hash = "sha256-gV5ba8SlPmkUptZkQfrrEDoFXrFTfs3eVOf807cO/f8=";

        rev = "f09ba2777714871bddb70d049878af34b94fa54d";

        hash = "sha256-yVpLW1DbcHDuM9Bm3uGhAC0v9XjmpBoU9x7kmWdg6/o=";

      };

    });

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

      src = fetchFromGitHub {

        owner = "KhronosGroup";

        repo = "spirv-headers";

        rev = "b2a156e1c0434bc8c99aaebba1c7be98be7ac580";

        hash = "sha256-qYhFoRrQOlvYvVXhIFsa3dZuORDpZyVC5peeYmGNimw=";

        rev = "85a1ed200d50660786c1a88d9166e871123cce39";

        hash = "sha256-lUWgZYGPu+IaLUrbtyC7R0o3Hq/q7C7BE8r7DAsiC30=";

      };

    });

    spirv-tools = (spirv-tools.overrideAttrs (old: {

      src = fetchFromGitHub {

        owner = "KhronosGroup";

        repo = "spirv-tools";

        rev = "5e61ea2098220059e89523f1f47b0bcd8c33b89a";

        hash = "sha256-jpVvjrNrTAKUY4sjUT/gCUElLtW4BrznH1DbStojGB8=";

        rev = "eb0a36633d2acf4de82588504f951ad0f2cecacb";

        hash = "sha256-sqjQoz9v9alSPc0ujEcWZxDAWh2S6oAPP1+JZmNCpA0=";

      };

    })).override { inherit (finalAttrs.passthru) spirv-headers; };

    vulkan-headers = vulkan-headers.overrideAttrs (old: {

      src = fetchFromGitHub {

        owner = "KhronosGroup";

        repo = "Vulkan-Headers";

        rev = "c896e2f920273bfee852da9cca2a356bc1c2031e";

        hash = "sha256-zUT5+Ttmkrj51a9FS1tQxoYMS0Y0xV8uaCEJNur4khc=";

        rev = "98f440ce6868c94f5ec6e198cc1adda4760e8849";

        hash = "sha256-EoD48jBoJmIet4BDC6bYxOsKK2358SZ/NcZeM61q/5g=";

      };

    });

  };
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { 
    owner = "KhronosGroup";

    repo = "MoltenVK";

    rev = "v${finalAttrs.version}";

    hash = "sha256-+/vlZvEuake0E2jFZOcctEVGMCcXelGPQJXt1EI06us=";

    hash = "sha256-PqrKGNGw7nJbirRgIargIV6Jbgoblu+2fn5qdHKI6BI=";

  };



  patches = [