ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-15 08:58:58 +03:00
Code Issues Projects Releases Wiki Activity

duckstation: migrate shaderc-patched to sources.nix

Browse Source
This commit is contained in:
Anderson Torres 2024-07-21 23:05:20 -03:00
parent 1954fef0d9
commit 94d4a294ef
3 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/by-name/du/duckstation/package.nix
View File

@ -19,7 +19,6 @@
let let
sources = callPackage ./sources.nix { }; sources = callPackage ./sources.nix { };
shaderc-patched = callPackage ./shaderc-patched.nix { };
inherit (qt6) inherit (qt6)
qtbase qtbase
qtsvg qtsvg
@ -56,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
qtbase qtbase
qtsvg qtsvg
qtwayland qtwayland
shaderc-patched sources.shaderc-patched
wayland wayland
] ]
++ cubeb.passthru.backendLibs; ++ cubeb.passthru.backendLibs;

33
pkgs/by-name/du/duckstation/shaderc-patched.nix
View File

@ -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"
];
})
];
}
)

30
pkgs/by-name/du/duckstation/sources.nix
View File

@ -1,5 +1,9 @@
{ {
lib,
duckstation,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
shaderc,
}: }:
{ {
@ -37,4 +41,30 @@
}; };
in in
self; 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"
];
})
];
}
);
} }