From 1954fef0d99e7d3bbfa3cd304b7c40f26dfc9043 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 24 Jun 2024 00:31:12 -0300 Subject: [PATCH] duckstation: pin shaderc-patched Since new versions arrived, we should pin that old piece. --- .../du/duckstation/shaderc-patched.nix | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/du/duckstation/shaderc-patched.nix b/pkgs/by-name/du/duckstation/shaderc-patched.nix index 72aa4b17ca08..9cedb99ebeeb 100644 --- a/pkgs/by-name/du/duckstation/shaderc-patched.nix +++ b/pkgs/by-name/du/duckstation/shaderc-patched.nix @@ -1,21 +1,33 @@ { lib, - fetchpatch, duckstation, + fetchFromGitHub, + fetchpatch, shaderc, }: -shaderc.overrideAttrs (old: { - pname = "shaderc-patched-for-duckstation"; - patches = (old.patches or [ ]) ++ [ - (fetchpatch { - url = "file://${duckstation.src}/scripts/shaderc-changes.patch"; - hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo="; - excludes = [ - "CHANGES" - "CMakeLists.txt" - "libshaderc/CMakeLists.txt" - ]; - }) - ]; -}) +shaderc.overrideAttrs (old: let + version = "2024.0"; + src = fetchFromGitHub { + owner = "google"; + repo = "shaderc"; + rev = "v${version}"; + hash = "sha256-Cwp7WbaKWw/wL9m70wfYu47xoUGQW+QGeoYhbyyzstQ="; + }; +in + { + pname = "shaderc-patched-for-duckstation"; + inherit version src; + patches = (old.patches or [ ]) ++ [ + (fetchpatch { + url = "file://${duckstation.src}/scripts/shaderc-changes.patch"; + hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo="; + excludes = [ + "CHANGES" + "CMakeLists.txt" + "libshaderc/CMakeLists.txt" + ]; + }) + ]; + } +)