summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nixos/modules/i18n/input-method/ibus.nix2
-rw-r--r--nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix2
-rw-r--r--nixos/modules/security/pam.nix8
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde5.nix255
-rw-r--r--nixos/modules/services/x11/desktop-managers/lumina.nix4
-rw-r--r--pkgs/applications/audio/i-score/default.nix4
-rw-r--r--pkgs/applications/misc/redshift-plasma-applet/default.nix4
-rw-r--r--pkgs/desktops/kde-5/applications/default.nix27
-rw-r--r--pkgs/desktops/kde-5/plasma/default.nix18
-rw-r--r--pkgs/development/libraries/kde-frameworks/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix65
11 files changed, 194 insertions, 197 deletions
diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix
index a5bbe6bcb559..f8e021f551e8 100644
--- a/nixos/modules/i18n/input-method/ibus.nix
+++ b/nixos/modules/i18n/input-method/ibus.nix
@@ -44,7 +44,7 @@ in
panel = mkOption {
type = with types; nullOr path;
default = null;
- example = literalExample "''${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
+ example = literalExample "''${pkgs.plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
description = "Replace the IBus panel with another panel.";
};
};
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
index c44dff3bb60d..b15aef885369 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
@@ -66,7 +66,7 @@ with lib;
in ''
mkdir -p /root/Desktop
ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
- ln -sfT ${pkgs.kde5.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop
+ ln -sfT ${pkgs.kdeApplications.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop
ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
'';
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index b51c8b4996be..5632500df2e0 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -280,8 +280,8 @@ let
${optionalString cfg.pamMount
"auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
${optionalString cfg.enableKwallet
- ("auth optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" +
- " kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")}
+ ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
+ " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
'') + ''
${optionalString cfg.unixAuth
"auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
@@ -349,8 +349,8 @@ let
${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)
"session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
${optionalString (cfg.enableKwallet)
- ("session optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" +
- " kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")}
+ ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
+ " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
'');
};
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 12408abd20ad..57924a73949c 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -6,9 +6,8 @@ let
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.kde5;
- xorg = pkgs.xorg;
- kde5 = pkgs.kde5;
+ inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
in
@@ -46,12 +45,12 @@ in
config = mkMerge [
(mkIf (cfg.extraPackages != []) {
- environment.systemPackages = [ (kde5.kdeWrapper cfg.extraPackages) ];
+ environment.systemPackages = [ (libsForQt5.kdeWrapper cfg.extraPackages) ];
})
(mkIf (xcfg.enable && cfg.enable) {
services.xserver.desktopManager.session = singleton {
- name = "kde5";
+ name = "Plasma 5";
bgSupport = true;
start = ''
# Load PulseAudio module for routing support.
@@ -60,128 +59,118 @@ in
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
''}
- exec "${kde5.startkde}"
+ exec "${plasma5.startkde}"
'';
};
security.wrappers = {
- kcheckpass.source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
- "start_kdeinit".source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit";
+ kcheckpass.source = "${plasma5.plasma-workspace.out}/lib/libexec/kcheckpass";
+ "start_kdeinit".source = "${libsForQt5.kinit.out}/lib/libexec/kf5/start_kdeinit";
};
- environment.systemPackages =
+ environment.systemPackages = with qt5; with libsForQt5; with plasma5; with kdeApplications;
[
- kde5.frameworkintegration
- kde5.kactivities
- kde5.kauth
- kde5.kcmutils
- kde5.kconfig
- kde5.kconfigwidgets
- kde5.kcoreaddons
- kde5.kdbusaddons
- kde5.kdeclarative
- kde5.kded
- kde5.kdesu
- kde5.kdnssd
- kde5.kemoticons
- kde5.kfilemetadata
- kde5.kglobalaccel
- kde5.kguiaddons
- kde5.kiconthemes
- kde5.kidletime
- kde5.kimageformats
- kde5.kinit
- kde5.kio
- kde5.kjobwidgets
- kde5.knewstuff
- kde5.knotifications
- kde5.knotifyconfig
- kde5.kpackage
- kde5.kparts
- kde5.kpeople
- kde5.krunner
- kde5.kservice
- kde5.ktextwidgets
- kde5.kwallet
- kde5.kwallet-pam
- kde5.kwalletmanager
- kde5.kwayland
- kde5.kwidgetsaddons
- kde5.kxmlgui
- kde5.kxmlrpcclient
- kde5.plasma-framework
- kde5.solid
- kde5.sonnet
- kde5.threadweaver
-
- kde5.breeze-qt5
- kde5.kactivitymanagerd
- kde5.kde-cli-tools
- kde5.kdecoration
- kde5.kdeplasma-addons
- kde5.kgamma5
- kde5.khotkeys
- kde5.kinfocenter
- kde5.kmenuedit
- kde5.kscreen
- kde5.kscreenlocker
- kde5.ksysguard
- kde5.kwayland
- kde5.kwin
- kde5.kwrited
- kde5.libkscreen
- kde5.libksysguard
- kde5.milou
- kde5.plasma-integration
- kde5.polkit-kde-agent
- kde5.systemsettings
-
- kde5.plasma-desktop
- kde5.plasma-workspace
- kde5.plasma-workspace-wallpapers
-
- kde5.dolphin-plugins
- kde5.ffmpegthumbs
- kde5.kdegraphics-thumbnailers
- kde5.kio-extras
- kde5.print-manager
-
- # Install Breeze icons if available
- (kde5.breeze-icons or kde5.oxygen-icons5 or kde5.oxygen-icons)
+ frameworkintegration
+ kactivities
+ kauth
+ kcmutils
+ kconfig
+ kconfigwidgets
+ kcoreaddons
+ kdbusaddons
+ kdeclarative
+ kded
+ kdesu
+ kdnssd
+ kemoticons
+ kfilemetadata
+ kglobalaccel
+ kguiaddons
+ kiconthemes
+ kidletime
+ kimageformats
+ kinit
+ kio
+ kjobwidgets
+ knewstuff
+ knotifications
+ knotifyconfig
+ kpackage
+ kparts
+ kpeople
+ krunner
+ kservice
+ ktextwidgets
+ kwallet
+ kwallet-pam
+ kwalletmanager
+ kwayland
+ kwidgetsaddons
+ kxmlgui
+ kxmlrpcclient
+ plasma-framework
+ solid
+ sonnet
+ threadweaver
+
+ breeze-qt5
+ kactivitymanagerd
+ kde-cli-tools
+ kdecoration
+ kdeplasma-addons
+ kgamma5
+ khotkeys
+ kinfocenter
+ kmenuedit
+ kscreen
+ kscreenlocker
+ ksysguard
+ kwayland
+ kwin
+ kwrited
+ libkscreen
+ libksysguard
+ milou
+ plasma-integration
+ polkit-kde-agent
+ systemsettings
+
+ plasma-desktop
+ plasma-workspace
+ plasma-workspace-wallpapers
+
+ dolphin-plugins
+ ffmpegthumbs
+ kdegraphics-thumbnailers
+ kio-extras
+ print-manager
+
+ breeze-icons
pkgs.hicolor_icon_theme
- kde5.kde-gtk-config kde5.breeze-gtk
+ kde-gtk-config breeze-gtk
- pkgs.qt5.phonon-backend-gstreamer
+ phonon-backend-gstreamer
]
- # Plasma 5.5 and later has a Breeze GTK theme.
- # If it is not available, Orion is very similar to Breeze.
- ++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion
-
- # Install activity manager if available
- ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd
-
- # frameworkintegration was split with plasma-integration in Plasma 5.6
- ++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration
-
- ++ lib.optionals cfg.enableQt4Support [ kde5.breeze-qt4 pkgs.phonon-backend-gstreamer ]
+ ++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ]
# Optional hardware support features
- ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil
- ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
- ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
- ++ lib.optional config.powerManagement.enable kde5.powerdevil
- ++ lib.optional config.services.colord.enable pkgs.colord-kde
- ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ];
+ ++ lib.optional config.hardware.bluetooth.enable bluedevil
+ ++ lib.optional config.networking.networkmanager.enable plasma-nm
+ ++ lib.optional config.hardware.pulseaudio.enable plasma-pa
+ ++ lib.optional config.powerManagement.enable powerdevil
+ ++ lib.optional config.services.colord.enable colord-kde
+ ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];
services.xserver.desktopManager.kde5.extraPackages =
+ with kdeApplications; with plasma5;
[
- kde5.khelpcenter
- kde5.oxygen
+ khelpcenter
+ oxygen
- kde5.dolphin
- kde5.konsole
+ dolphin
+ konsole
];
environment.pathsToLink = [ "/share" ];
@@ -191,30 +180,24 @@ in
target = "X11/xkb";
};
- environment.variables =
- {
- # Enable GTK applications to load SVG icons
- GST_PLUGIN_SYSTEM_PATH_1_0 =
- lib.makeSearchPath "/lib/gstreamer-1.0"
- (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
- gstreamer
- gst-plugins-base
- gst-plugins-good
- gst-plugins-ugly
- gst-plugins-bad
- gst-libav # for mp3 playback
- ]));
- }
- // (if (lib.hasAttr "breeze-icons" kde5)
- then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; }
- else { });
-
- fonts.fonts = [
- (kde5.oxygen-fonts or pkgs.noto-fonts)
- pkgs.hack-font
- ];
+ environment.variables = {
+ # Enable GTK applications to load SVG icons
+ GST_PLUGIN_SYSTEM_PATH_1_0 =
+ lib.makeSearchPath "/lib/gstreamer-1.0"
+ (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
+ gst-plugins-ugly
+ gst-plugins-bad
+ gst-libav # for mp3 playback
+ ]));
+ GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
+ };
+
+ fonts.fonts = with pkgs; [ noto-fonts hack-font ];
- programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass";
+ programs.ssh.askPassword = "${plasma5.ksshaskpass.out}/bin/ksshaskpass";
# Enable helpful DBus services.
services.udisks2.enable = true;
@@ -230,10 +213,10 @@ in
services.xserver.displayManager.sddm = {
theme = "breeze";
- themes = [
- kde5.ecm # for the setup-hook
- kde5.plasma-workspace
- kde5.breeze-icons
+ themes = with libsForQt5; with plasma5; [
+ ecm # for the setup-hook
+ plasma-workspace
+ breeze-icons
];
};
@@ -250,7 +233,7 @@ in
# use kimpanel as the default IBus panel
i18n.inputMethod.ibus.panel =
lib.mkDefault
- "${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
+ "${plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
})
];
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix
index f0b31a2acb01..ed5ad4a2a001 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixos/modules/services/x11/desktop-managers/lumina.nix
@@ -32,8 +32,8 @@ in
environment.systemPackages = [
pkgs.fluxbox
- pkgs.kde5.kwindowsystem
- pkgs.kde5.oxygen-icons5
+ pkgs.qt5.kwindowsystem
+ pkgs.qt5.oxygen-icons5
pkgs.lumina
pkgs.numlockx
pkgs.qt5.qtsvg
diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index e3ebc5fde08e..1a47b74e21c7 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -6,7 +6,7 @@
gcc,
ginac,
jamomacore,
- kde5,
+ kdnssd,
libsndfile,
ninja,
portaudio,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
ginac
gcc
jamomacore
- kde5.kdnssd
+ kdnssd
libsndfile
ninja
portaudio
diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 3cf6f7d754be..fe09f7ff16ea 100644
--- a/pkgs/applications/misc/redshift-plasma-applet/default.nix
+++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, kde5, redshift, fetchFromGitHub, ... }:
+{ stdenv, cmake, plasma-framework, redshift, fetchFromGitHub, }:
let version = "1.0.17"; in
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
buildInputs = [
cmake
- kde5.plasma-framework
+ plasma-framework
];
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index 3284b2709c86..a53bbedc2c54 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -20,31 +20,34 @@ still shows most of the available features is in `./gwenview.nix`.
1. Update the URL in `./fetch.sh`.
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
+3. Use `nox-review wip` to check that everything builds.
4. Commit the changes and open a pull request.
*/
-{ pkgs, debug ? false }:
+{
+ stdenv, lib, libsForQt5, fetchurl,
+ plasma5,
+ attica, phonon,
+ debug ? false,
+}:
let
- inherit (pkgs) lib stdenv;
-
mirror = "mirror://kde";
- srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+ srcs = import ./srcs.nix { inherit fetchurl mirror; };
packages = self: with self; {
kdeApp = import ./kde-app.nix {
inherit lib;
inherit debug srcs;
- inherit kdeDerivation;
+ inherit (libsForQt5) kdeDerivation;
};
kdelibs = callPackage ./kdelibs {
inherit (srcs.kdelibs) src version;
- inherit (pkgs) attica phonon;
+ inherit attica phonon;
};
akonadi = callPackage ./akonadi.nix {};
@@ -54,9 +57,7 @@ let
baloo-widgets = callPackage ./baloo-widgets.nix {};
dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {};
- ffmpegthumbs = callPackage ./ffmpegthumbs.nix {
- ffmpeg = pkgs.ffmpeg_2;
- };
+ ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
filelight = callPackage ./filelight.nix {};
gwenview = callPackage ./gwenview.nix {};
kate = callPackage ./kate.nix {};
@@ -85,9 +86,11 @@ let
okteta = callPackage ./okteta.nix {};
okular = callPackage ./okular.nix {};
print-manager = callPackage ./print-manager.nix {};
- spectacle = callPackage ./spectacle.nix {};
+ spectacle = callPackage ./spectacle.nix {
+ inherit (plasma5) kscreen;
+ };
l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
};
-in packages
+in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
index 3ac1c51848e9..e42a543ea23d 100644
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ b/pkgs/desktops/kde-5/plasma/default.nix
@@ -19,19 +19,21 @@ existing packages here and modify it as necessary.
1. Update the URL in `./fetch.sh`.
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma`
from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
+3. Use `nox-review wip` to check that everything builds.
4. Commit the changes and open a pull request.
*/
-{ pkgs, debug ? false }:
+{
+ stdenv, lib, libsForQt5, makeSetupHook, symlinkJoin, fetchurl,
+ gconf,
+ debug ? false,
+}:
let
- inherit (pkgs) lib makeSetupHook stdenv symlinkJoin;
-
mirror = "mirror://kde";
- srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+ srcs = import ./srcs.nix { inherit fetchurl mirror; };
packages = self: with self; {
plasmaPackage = args:
@@ -39,7 +41,7 @@ let
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
- in kdeDerivation (args // {
+ in libsForQt5.kdeDerivation (args // {
name = "${name}-${version}";
inherit src;
@@ -86,7 +88,7 @@ let
plasma-integration = callPackage ./plasma-integration.nix {};
plasma-nm = callPackage ./plasma-nm {};
plasma-pa = callPackage ./plasma-pa.nix {
- inherit (pkgs.gnome3) gconf;
+ inherit gconf;
};
plasma-workspace = callPackage ./plasma-workspace {};
plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
@@ -96,4 +98,4 @@ let
systemsettings = callPackage ./systemsettings.nix {};
};
-in packages
+in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index ac6b319a0ddd..a4e64aaee41e 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -19,7 +19,7 @@ existing packages here and modify it as necessary.
1. Update the URL in `./fetch.sh`.
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks`
from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
+3. Use `nox-review wip` to check that everything builds.
4. Commit the changes and open a pull request.
*/
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28bfd94d119f..27f6dce1cde1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7846,7 +7846,7 @@ with pkgs;
judy = callPackage ../development/libraries/judy { };
- kdelibs4 = kde5.applications.kdelibs;
+ kdelibs4 = kdeApplications.kdelibs;
keybinder = callPackage ../development/libraries/keybinder {
automake = automake111x;
@@ -12791,7 +12791,7 @@ with pkgs;
calligra = kde4.callPackage ../applications/office/calligra {
vc = vc_0_7;
- oxygen_icons = kde5.oxygen-icons5;
+ oxygen_icons = libsForQt5.oxygen-icons5;
};
camlistore = callPackage ../applications/misc/camlistore { };
@@ -14048,17 +14048,29 @@ with pkgs;
kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {};
+ kdeApplications = import ../desktops/kde-5/applications {
+ inherit stdenv lib libsForQt5 fetchurl;
+ inherit plasma5;
+ inherit attica phonon;
+ };
+
kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
- kdecoration-viewer = kde5.callPackage ../tools/misc/kdecoration-viewer {};
+ kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer {
+ inherit (plasma5) kdecoration;
+ };
- kdevelop-pg-qt = kde5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {};
+ kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {};
- kdevelop = kde5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
+ kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
+ inherit (kdeApplications) konsole;
+ inherit (plasma5) libksysguard;
llvmPackages = llvmPackages_38;
};
- kdevplatform = kde5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix {};
+ kdevplatform = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix {
+ inherit (kdeApplications) libkomparediff2;
+ };
keepnote = callPackage ../applications/office/keepnote { };
@@ -14080,14 +14092,18 @@ with pkgs;
qt = qt4;
};
- kile = kde5.callPackage ../applications/editors/kile { };
+ kile = libsForQt5.callPackage ../applications/editors/kile {
+ inherit (kdeApplications) konsole;
+ };
kino = callPackage ../applications/video/kino {
inherit (gnome2) libglade;
ffmpeg = ffmpeg_2;
};
- kipi-plugins = kde5.callPackage ../applications/graphics/kipi-plugins {};
+ kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins {
+ inherit (kdeApplications) libkipi;
+ };
kiwix = callPackage ../applications/misc/kiwix {
stdenv = overrideCC stdenv gcc49;
@@ -16050,7 +16066,9 @@ with pkgs;
yabar = callPackage ../applications/window-managers/yabar { };
- yakuake = kde5.callPackage ../applications/misc/yakuake {};
+ yakuake = libsForQt5.callPackage ../applications/misc/yakuake {
+ inherit (kdeApplications) konsole;
+ };
yarp = callPackage ../applications/science/robotics/yarp {};
@@ -16210,7 +16228,9 @@ with pkgs;
dhewm3 = callPackage ../games/dhewm3 {};
- digikam = kde5.callPackage ../applications/graphics/digikam {
+ digikam = libsForQt5.callPackage ../applications/graphics/digikam {
+ inherit (kdeApplications) libkipi marble;
+ inherit (plasma5) oxygen;
boost = boost160;
};
@@ -16779,7 +16799,7 @@ with pkgs;
);
in recurseIntoAttrs self;
- lumina = qt5.callPackage ../desktops/lumina { };
+ lumina = libsForQt5.callPackage ../desktops/lumina { };
lxqt = recurseIntoAttrs (import ../desktops/lxqt {
inherit pkgs libsForQt5 fetchFromGitHub;
@@ -16795,11 +16815,16 @@ with pkgs;
pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
};
+ plasma5 = import ../desktops/kde-5/plasma {
+ inherit stdenv lib libsForQt5 makeSetupHook symlinkJoin fetchurl;
+ inherit (gnome3) gconf;
+ };
+
redshift = callPackage ../applications/misc/redshift {
inherit (python3Packages) python pygobject3 pyxdg;
};
- redshift-plasma-applet = callPackage ../applications/misc/redshift-plasma-applet { };
+ redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };
orion = callPackage ../misc/themes/orion {};
@@ -16813,22 +16838,6 @@ with pkgs;
numix-gtk-theme = callPackage ../misc/themes/numix { };
- kde5 =
- let
- plasma = import ../desktops/kde-5/plasma { inherit pkgs; };
- applications = import ../desktops/kde-5/applications { inherit pkgs; };
- merged = self:
- {
- plasma = plasma self;
- frameworks = libsForQt5.kdeFrameworks;
- applications = applications self;
- }
- // libsForQt5.kdeFrameworks
- // plasma self
- // applications self;
- in
- recurseIntoAttrs (lib.makeScope libsForQt5.newScope merged);
-
theme-vertex = callPackage ../misc/themes/vertex { };
rox-filer = callPackage ../desktops/rox/rox-filer {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 12:48:54 +0000