From a4f27b49af89aa2e88b1483e3ee7fe94a0ce165d Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 30 Sep 2025 21:07:03 +0200 Subject: [PATCH] Kde/patches: override packages instead of replacing at runtime This causes A LOT more rebuilds, but it's less hacky --- roles/kde/patches/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/roles/kde/patches/default.nix b/roles/kde/patches/default.nix index 93ab1cb..9259279 100644 --- a/roles/kde/patches/default.nix +++ b/roles/kde/patches/default.nix @@ -1,4 +1,4 @@ -{lib, pkgs, ...}: let +{lib, ...}: let rootDirs = builtins.readDir ./.; removeFiles = lib.attrsets.filterAttrs (n: v: v == "directory") rootDirs; programsToPatch = builtins.attrNames removeFiles; @@ -17,7 +17,9 @@ program: let unpatchedProgram = prev."${program}"; in { - "${program}-patched" = unpatchedProgram.overrideAttrs { + "${program}" = unpatchedProgram.overrideAttrs { + version = "${unpatchedProgram.version}-patched"; + __intentionallyOverridingVersion = true; patches = unpatchedProgram.patches ++ getPatches program; }; } @@ -31,14 +33,4 @@ in { } ) ]; - - system.replaceDependencies.replacements = lib.lists.forEach programsToPatch ( - package: { - oldDependency = pkgs.kdePackages.${package}; - newDependency = pkgs.kdePackages."${package}-patched"; - } - ); - system.extraDependencies = lib.lists.forEach programsToPatch ( - package: pkgs.kdePackages."${package}-patched" - ); }