diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix index f6347e427b36..1f0eac6130fd 100644 --- a/pkgs/by-name/du/duckstation/package.nix +++ b/pkgs/by-name/du/duckstation/package.nix @@ -19,7 +19,6 @@ let sources = callPackage ./sources.nix { }; - shaderc-patched = callPackage ./shaderc-patched.nix { }; inherit (qt6) qtbase qtsvg @@ -56,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtsvg qtwayland - shaderc-patched + sources.shaderc-patched wayland ] ++ cubeb.passthru.backendLibs; diff --git a/pkgs/by-name/du/duckstation/shaderc-patched.nix b/pkgs/by-name/du/duckstation/shaderc-patched.nix deleted file mode 100644 index 9cedb99ebeeb..000000000000 --- a/pkgs/by-name/du/duckstation/shaderc-patched.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - duckstation, - fetchFromGitHub, - fetchpatch, - shaderc, -}: - -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" - ]; - }) - ]; - } -) diff --git a/pkgs/by-name/du/duckstation/sources.nix b/pkgs/by-name/du/duckstation/sources.nix index d72364c4e97c..b52b87d45eb3 100644 --- a/pkgs/by-name/du/duckstation/sources.nix +++ b/pkgs/by-name/du/duckstation/sources.nix @@ -1,5 +1,9 @@ { + lib, + duckstation, fetchFromGitHub, + fetchpatch, + shaderc, }: { @@ -37,4 +41,30 @@ }; in self; + + shaderc-patched = 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" + ]; + }) + ]; + } + ); }