diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-03-29 15:33:46 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-03-30 14:31:45 +0100 |
commit | 94805a3d21e407908ebf1d6de7d21028f01776db (patch) | |
tree | ce2d800df6c3f74a6f0f2a655959cb55ea3e039f /nixos | |
parent | 26538d4700c60b9be5329859eae6e8a57e762f04 (diff) |
nixos/partition-manager: use qt6 when plasma6 is activated
This also fixes System Settings > Windows Shares complaining about the
wrong QT version under Plasma6.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/programs/partition-manager.nix | 14 | ||||
-rw-r--r-- | nixos/modules/services/desktop-managers/plasma6.nix | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/nixos/modules/programs/partition-manager.nix b/nixos/modules/programs/partition-manager.nix index bb7c91c941e2..63b637f9952b 100644 --- a/nixos/modules/programs/partition-manager.nix +++ b/nixos/modules/programs/partition-manager.nix @@ -1,15 +1,21 @@ { config, lib, pkgs, ... }: -{ +let + cfg = config.programs.partition-manager; +in { meta.maintainers = [ lib.maintainers.oxalica ]; options = { - programs.partition-manager.enable = lib.mkEnableOption (lib.mdDoc "KDE Partition Manager"); + programs.partition-manager = { + enable = lib.mkEnableOption (lib.mdDoc "KDE Partition Manager"); + + package = lib.mkPackageOption pkgs [ "libsForQt5" "partitionmanager" ] { }; + }; }; config = lib.mkIf config.programs.partition-manager.enable { - services.dbus.packages = [ pkgs.libsForQt5.kpmcore ]; + services.dbus.packages = [ cfg.package.kpmcore ]; # `kpmcore` need to be installed to pull in polkit actions. - environment.systemPackages = [ pkgs.libsForQt5.kpmcore pkgs.libsForQt5.partitionmanager ]; + environment.systemPackages = [ cfg.package.kpmcore cfg.package ]; }; } diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index e20b431f0b58..5f1f2cec79e8 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -286,6 +286,7 @@ in { }; programs.kdeconnect.package = kdePackages.kdeconnect-kde; + programs.partition-manager.package = kdePackages.partitionmanager; # FIXME: ugly hack. See #292632 for details. system.userActivationScripts.rebuildSycoca = activationScript; |