From c00ef6ab7c4cf9e5c28aa87631a31289be2a152a Mon Sep 17 00:00:00 2001 From: Toast Date: Sun, 2 Nov 2025 13:44:37 +0100 Subject: [PATCH] Kde/patches: get patches with lib.toast.patches.patchesInPath --- roles/kde/patches/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/roles/kde/patches/default.nix b/roles/kde/patches/default.nix index 9259279..374881a 100644 --- a/roles/kde/patches/default.nix +++ b/roles/kde/patches/default.nix @@ -3,24 +3,17 @@ removeFiles = lib.attrsets.filterAttrs (n: v: v == "directory") rootDirs; programsToPatch = builtins.attrNames removeFiles; - getPatches = name: - builtins.map (value: ./${name}/${value}) (builtins.attrNames ( - lib.attrsets.filterAttrs ( - n: v: - v == "regular" && lib.strings.hasSuffix ".patch" n - ) (builtins.readDir ./${name}) - )); - bigOverlay = final: prev: lib.attrsets.mergeAttrsList ( lib.lists.forEach programsToPatch ( program: let unpatchedProgram = prev."${program}"; + newPatches = lib.toast.patches.patchesInPath (lib.path.append ./. program); in { "${program}" = unpatchedProgram.overrideAttrs { version = "${unpatchedProgram.version}-patched"; __intentionallyOverridingVersion = true; - patches = unpatchedProgram.patches ++ getPatches program; + patches = unpatchedProgram.patches ++ newPatches; }; } )