From cd5723734acbffa63e11a69cf6767f8ef69f6517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 18 Apr 2023 12:33:44 +0200 Subject: [PATCH] rofi: skip override if there are no plugins (#3885) Avoid needless calls to `override` (also allows using `pkgs.rofi-unwrapped` with no plugins). --- modules/programs/rofi.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/programs/rofi.nix b/modules/programs/rofi.nix index 64907073..8b1fc991 100644 --- a/modules/programs/rofi.nix +++ b/modules/programs/rofi.nix @@ -264,8 +264,8 @@ in { programs.rofi.finalPackage = let rofiWithPlugins = cfg.package.override - (old: rec { plugins = (old.plugins or [ ]) ++ cfg.plugins; }); - in if builtins.hasAttr "override" cfg.package then + (old: { plugins = (old.plugins or [ ]) ++ cfg.plugins; }); + in if builtins.hasAttr "override" cfg.package && cfg.plugins != [ ] then rofiWithPlugins else cfg.package;