dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/partition-manager: use qt6 when plasma6 is activated

Browse Source 
This also fixes System Settings > Windows Shares complaining about the
wrong QT version under Plasma6.
This commit is contained in:
Sandro Jäckel 2024-03-29 15:33:46 +01:00
parent 26538d4700
commit 94805a3d21
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/programs/partition-manager.nix
View File

@ -1,15 +1,21 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ let
cfg = config.programs.partition-manager;
in {
meta.maintainers = [ lib.maintainers.oxalica ]; meta.maintainers = [ lib.maintainers.oxalica ];
options = { 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 { 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. # `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 ];
}; };
} }

1
nixos/modules/services/desktop-managers/plasma6.nix
View File

@ -286,6 +286,7 @@ in {
}; };
programs.kdeconnect.package = kdePackages.kdeconnect-kde; programs.kdeconnect.package = kdePackages.kdeconnect-kde;
programs.partition-manager.package = kdePackages.partitionmanager;
# FIXME: ugly hack. See #292632 for details. # FIXME: ugly hack. See #292632 for details.
system.userActivationScripts.rebuildSycoca = activationScript; system.userActivationScripts.rebuildSycoca = activationScript;

5
pkgs/applications/kde/partitionmanager/default.nix
View File

@ -1,5 +1,4 @@
{ mkDerivation { mkDerivation
, fetchurl
, lib , lib
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
@ -80,6 +79,10 @@ mkDerivation {
) )
''; '';
passthru = {
inherit kpmcore;
};
meta = with lib; { meta = with lib; {
description = "KDE Partition Manager"; description = "KDE Partition Manager";
longDescription = '' longDescription = ''

5
pkgs/kde/gear/partitionmanager/default.nix
View File

@ -6,5 +6,10 @@ mkKdeDerivation {
pname = "partitionmanager"; pname = "partitionmanager";
propagatedUserEnvPkgs = [kpmcore]; propagatedUserEnvPkgs = [kpmcore];
passthru = {
inherit kpmcore;
};
meta.mainProgram = "partitionmanager"; meta.mainProgram = "partitionmanager";
} }