mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-11 07:15:54 +03:00
nixos/partition-manager: use qt6 when plasma6 is activated
This also fixes System Settings > Windows Shares complaining about the wrong QT version under Plasma6.
This commit is contained in:
parent
26538d4700
commit
94805a3d21
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -1,5 +1,4 @@
|
||||
{ mkDerivation
|
||||
, fetchurl
|
||||
, lib
|
||||
, extra-cmake-modules
|
||||
, kdoctools
|
||||
@ -80,6 +79,10 @@ mkDerivation {
|
||||
)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit kpmcore;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "KDE Partition Manager";
|
||||
longDescription = ''
|
||||
|
@ -6,5 +6,10 @@ mkKdeDerivation {
|
||||
pname = "partitionmanager";
|
||||
|
||||
propagatedUserEnvPkgs = [kpmcore];
|
||||
|
||||
passthru = {
|
||||
inherit kpmcore;
|
||||
};
|
||||
|
||||
meta.mainProgram = "partitionmanager";
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user