public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove top-level kde5 attribute

Browse Source 
- There is no such thing as KDE 5
This commit is contained in:
Thomas Tuegel 2017-02-25 12:25:44 -06:00
parent c1ddd2353b
commit 8eb4d2afbc
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
11 changed files with 189 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/i18n/input-method/ibus.nix
View File

@ -44,7 +44,7 @@ in
panel = mkOption { panel = mkOption {
type = with types; nullOr path; type = with types; nullOr path;
default = null; 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."; description = "Replace the IBus panel with another panel.";
}; };
}; };

2
nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
View File

@ -66,7 +66,7 @@ with lib;
in '' in ''
mkdir -p /root/Desktop mkdir -p /root/Desktop
ln -sfT ${desktopFile} /root/Desktop/nixos-manual.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 ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
''; '';

8
nixos/modules/security/pam.nix
View File

@ -280,8 +280,8 @@ let
${optionalString cfg.pamMount ${optionalString cfg.pamMount
"auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
${optionalString cfg.enableKwallet ${optionalString cfg.enableKwallet
("auth optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" + ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")} " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
'') + '' '') + ''
${optionalString cfg.unixAuth ${optionalString cfg.unixAuth
"auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} "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) ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)
"session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
${optionalString (cfg.enableKwallet) ${optionalString (cfg.enableKwallet)
("session optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" + ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")} " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
''); '');
}; };

245
nixos/modules/services/x11/desktop-managers/kde5.nix
View File

@ -6,9 +6,8 @@ let
xcfg = config.services.xserver; xcfg = config.services.xserver;
cfg = xcfg.desktopManager.kde5; cfg = xcfg.desktopManager.kde5;
xorg = pkgs.xorg;
kde5 = pkgs.kde5; inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
in in
@ -46,12 +45,12 @@ in
config = mkMerge [ config = mkMerge [
(mkIf (cfg.extraPackages != []) { (mkIf (cfg.extraPackages != []) {
environment.systemPackages = [ (kde5.kdeWrapper cfg.extraPackages) ]; environment.systemPackages = [ (libsForQt5.kdeWrapper cfg.extraPackages) ];
}) })
(mkIf (xcfg.enable && cfg.enable) { (mkIf (xcfg.enable && cfg.enable) {
services.xserver.desktopManager.session = singleton { services.xserver.desktopManager.session = singleton {
name = "kde5"; name = "Plasma 5";
bgSupport = true; bgSupport = true;
start = '' start = ''
# Load PulseAudio module for routing support. # 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" ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
''} ''}
exec "${kde5.startkde}" exec "${plasma5.startkde}"
''; '';
}; };
security.wrappers = { security.wrappers = {
kcheckpass.source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass"; kcheckpass.source = "${plasma5.plasma-workspace.out}/lib/libexec/kcheckpass";
"start_kdeinit".source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit"; "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 frameworkintegration
kde5.kactivities kactivities
kde5.kauth kauth
kde5.kcmutils kcmutils
kde5.kconfig kconfig
kde5.kconfigwidgets kconfigwidgets
kde5.kcoreaddons kcoreaddons
kde5.kdbusaddons kdbusaddons
kde5.kdeclarative kdeclarative
kde5.kded kded
kde5.kdesu kdesu
kde5.kdnssd kdnssd
kde5.kemoticons kemoticons
kde5.kfilemetadata kfilemetadata
kde5.kglobalaccel kglobalaccel
kde5.kguiaddons kguiaddons
kde5.kiconthemes kiconthemes
kde5.kidletime kidletime
kde5.kimageformats kimageformats
kde5.kinit kinit
kde5.kio kio
kde5.kjobwidgets kjobwidgets
kde5.knewstuff knewstuff
kde5.knotifications knotifications
kde5.knotifyconfig knotifyconfig
kde5.kpackage kpackage
kde5.kparts kparts
kde5.kpeople kpeople
kde5.krunner krunner
kde5.kservice kservice
kde5.ktextwidgets ktextwidgets
kde5.kwallet kwallet
kde5.kwallet-pam kwallet-pam
kde5.kwalletmanager kwalletmanager
kde5.kwayland kwayland
kde5.kwidgetsaddons kwidgetsaddons
kde5.kxmlgui kxmlgui
kde5.kxmlrpcclient kxmlrpcclient
kde5.plasma-framework plasma-framework
kde5.solid solid
kde5.sonnet sonnet
kde5.threadweaver threadweaver
kde5.breeze-qt5 breeze-qt5
kde5.kactivitymanagerd kactivitymanagerd
kde5.kde-cli-tools kde-cli-tools
kde5.kdecoration kdecoration
kde5.kdeplasma-addons kdeplasma-addons
kde5.kgamma5 kgamma5
kde5.khotkeys khotkeys
kde5.kinfocenter kinfocenter
kde5.kmenuedit kmenuedit
kde5.kscreen kscreen
kde5.kscreenlocker kscreenlocker
kde5.ksysguard ksysguard
kde5.kwayland kwayland
kde5.kwin kwin
kde5.kwrited kwrited
kde5.libkscreen libkscreen
kde5.libksysguard libksysguard
kde5.milou milou
kde5.plasma-integration plasma-integration
kde5.polkit-kde-agent polkit-kde-agent
kde5.systemsettings systemsettings
kde5.plasma-desktop plasma-desktop
kde5.plasma-workspace plasma-workspace
kde5.plasma-workspace-wallpapers plasma-workspace-wallpapers
kde5.dolphin-plugins dolphin-plugins
kde5.ffmpegthumbs ffmpegthumbs
kde5.kdegraphics-thumbnailers kdegraphics-thumbnailers
kde5.kio-extras kio-extras
kde5.print-manager print-manager
# Install Breeze icons if available breeze-icons
(kde5.breeze-icons or kde5.oxygen-icons5 or kde5.oxygen-icons)
pkgs.hicolor_icon_theme 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. ++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ]
# 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 ]
# Optional hardware support features # Optional hardware support features
++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil ++ lib.optional config.hardware.bluetooth.enable bluedevil
++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm ++ lib.optional config.networking.networkmanager.enable plasma-nm
++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa ++ lib.optional config.hardware.pulseaudio.enable plasma-pa
++ lib.optional config.powerManagement.enable kde5.powerdevil ++ lib.optional config.powerManagement.enable powerdevil
++ lib.optional config.services.colord.enable pkgs.colord-kde ++ lib.optional config.services.colord.enable colord-kde
++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ]; ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];
services.xserver.desktopManager.kde5.extraPackages = services.xserver.desktopManager.kde5.extraPackages =
with kdeApplications; with plasma5;
[ [
kde5.khelpcenter khelpcenter
kde5.oxygen oxygen
kde5.dolphin dolphin
kde5.konsole konsole
]; ];
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];
@ -191,30 +180,24 @@ in
target = "X11/xkb"; target = "X11/xkb";
}; };
environment.variables = environment.variables = {
{ # Enable GTK applications to load SVG icons
# Enable GTK applications to load SVG icons GST_PLUGIN_SYSTEM_PATH_1_0 =
GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPath "/lib/gstreamer-1.0"
lib.makeSearchPath "/lib/gstreamer-1.0" (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
(builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [ gstreamer
gstreamer gst-plugins-base
gst-plugins-base gst-plugins-good
gst-plugins-good gst-plugins-ugly
gst-plugins-ugly gst-plugins-bad
gst-plugins-bad gst-libav # for mp3 playback
gst-libav # for mp3 playback ]));
])); GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
} };
// (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 = [ fonts.fonts = with pkgs; [ noto-fonts hack-font ];
(kde5.oxygen-fonts or pkgs.noto-fonts)
pkgs.hack-font
];
programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass"; programs.ssh.askPassword = "${plasma5.ksshaskpass.out}/bin/ksshaskpass";
# Enable helpful DBus services. # Enable helpful DBus services.
services.udisks2.enable = true; services.udisks2.enable = true;
@ -230,10 +213,10 @@ in
services.xserver.displayManager.sddm = { services.xserver.displayManager.sddm = {
theme = "breeze"; theme = "breeze";
themes = [ themes = with libsForQt5; with plasma5; [
kde5.ecm # for the setup-hook ecm # for the setup-hook
kde5.plasma-workspace plasma-workspace
kde5.breeze-icons breeze-icons
]; ];
}; };
@ -250,7 +233,7 @@ in
# use kimpanel as the default IBus panel # use kimpanel as the default IBus panel
i18n.inputMethod.ibus.panel = i18n.inputMethod.ibus.panel =
lib.mkDefault lib.mkDefault
"${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"; "${plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
}) })
]; ];

4
nixos/modules/services/x11/desktop-managers/lumina.nix
View File

@ -32,8 +32,8 @@ in
environment.systemPackages = [ environment.systemPackages = [
pkgs.fluxbox pkgs.fluxbox
pkgs.kde5.kwindowsystem pkgs.qt5.kwindowsystem
pkgs.kde5.oxygen-icons5 pkgs.qt5.oxygen-icons5
pkgs.lumina pkgs.lumina
pkgs.numlockx pkgs.numlockx
pkgs.qt5.qtsvg pkgs.qt5.qtsvg

4
pkgs/applications/audio/i-score/default.nix
View File

@ -6,7 +6,7 @@
gcc, gcc,
ginac, ginac,
jamomacore, jamomacore,
kde5, kdnssd,
libsndfile, libsndfile,
ninja, ninja,
portaudio, portaudio,
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
ginac ginac
gcc gcc
jamomacore jamomacore
kde5.kdnssd kdnssd
libsndfile libsndfile
ninja ninja
portaudio portaudio

4
pkgs/applications/misc/redshift-plasma-applet/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, cmake, kde5, redshift, fetchFromGitHub, ... }: { stdenv, cmake, plasma-framework, redshift, fetchFromGitHub, }:
let version = "1.0.17"; in let version = "1.0.17"; in
@ -26,7 +26,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
cmake cmake
kde5.plasma-framework plasma-framework
]; ];

27
pkgs/desktops/kde-5/applications/default.nix
View File

@ -20,31 +20,34 @@ still shows most of the available features is in `./gwenview.nix`.
1. Update the URL in `./fetch.sh`. 1. Update the URL in `./fetch.sh`.
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications` 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
from the top of the Nixpkgs tree. 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. 4. Commit the changes and open a pull request.
*/ */
{ pkgs, debug ? false }: {
stdenv, lib, libsForQt5, fetchurl,
plasma5,
attica, phonon,
debug ? false,
}:
let let
inherit (pkgs) lib stdenv;
mirror = "mirror://kde"; mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; srcs = import ./srcs.nix { inherit fetchurl mirror; };
packages = self: with self; { packages = self: with self; {
kdeApp = import ./kde-app.nix { kdeApp = import ./kde-app.nix {
inherit lib; inherit lib;
inherit debug srcs; inherit debug srcs;
inherit kdeDerivation; inherit (libsForQt5) kdeDerivation;
}; };
kdelibs = callPackage ./kdelibs { kdelibs = callPackage ./kdelibs {
inherit (srcs.kdelibs) src version; inherit (srcs.kdelibs) src version;
inherit (pkgs) attica phonon; inherit attica phonon;
}; };
akonadi = callPackage ./akonadi.nix {}; akonadi = callPackage ./akonadi.nix {};
@ -54,9 +57,7 @@ let
baloo-widgets = callPackage ./baloo-widgets.nix {}; baloo-widgets = callPackage ./baloo-widgets.nix {};
dolphin = callPackage ./dolphin.nix {}; dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
ffmpeg = pkgs.ffmpeg_2;
};
filelight = callPackage ./filelight.nix {}; filelight = callPackage ./filelight.nix {};
gwenview = callPackage ./gwenview.nix {}; gwenview = callPackage ./gwenview.nix {};
kate = callPackage ./kate.nix {}; kate = callPackage ./kate.nix {};
@ -85,9 +86,11 @@ let
okteta = callPackage ./okteta.nix {}; okteta = callPackage ./okteta.nix {};
okular = callPackage ./okular.nix {}; okular = callPackage ./okular.nix {};
print-manager = callPackage ./print-manager.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; }); l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
}; };
in packages in lib.makeScope libsForQt5.newScope packages

18
pkgs/desktops/kde-5/plasma/default.nix
View File

@ -19,19 +19,21 @@ existing packages here and modify it as necessary.
1. Update the URL in `./fetch.sh`. 1. Update the URL in `./fetch.sh`.
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma` 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma`
from the top of the Nixpkgs tree. 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. 4. Commit the changes and open a pull request.
*/ */
{ pkgs, debug ? false }: {
stdenv, lib, libsForQt5, makeSetupHook, symlinkJoin, fetchurl,
gconf,
debug ? false,
}:
let let
inherit (pkgs) lib makeSetupHook stdenv symlinkJoin;
mirror = "mirror://kde"; mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; srcs = import ./srcs.nix { inherit fetchurl mirror; };
packages = self: with self; { packages = self: with self; {
plasmaPackage = args: plasmaPackage = args:
@ -39,7 +41,7 @@ let
inherit (args) name; inherit (args) name;
sname = args.sname or name; sname = args.sname or name;
inherit (srcs."${sname}") src version; inherit (srcs."${sname}") src version;
in kdeDerivation (args // { in libsForQt5.kdeDerivation (args // {
name = "${name}-${version}"; name = "${name}-${version}";
inherit src; inherit src;
@ -86,7 +88,7 @@ let
plasma-integration = callPackage ./plasma-integration.nix {}; plasma-integration = callPackage ./plasma-integration.nix {};
plasma-nm = callPackage ./plasma-nm {}; plasma-nm = callPackage ./plasma-nm {};
plasma-pa = callPackage ./plasma-pa.nix { plasma-pa = callPackage ./plasma-pa.nix {
inherit (pkgs.gnome3) gconf; inherit gconf;
}; };
plasma-workspace = callPackage ./plasma-workspace {}; plasma-workspace = callPackage ./plasma-workspace {};
plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
@ -96,4 +98,4 @@ let
systemsettings = callPackage ./systemsettings.nix {}; systemsettings = callPackage ./systemsettings.nix {};
}; };
in packages in lib.makeScope libsForQt5.newScope packages

2
pkgs/development/libraries/kde-frameworks/default.nix
View File

@ -19,7 +19,7 @@ existing packages here and modify it as necessary.
1. Update the URL in `./fetch.sh`. 1. Update the URL in `./fetch.sh`.
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks` 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks`
from the top of the Nixpkgs tree. 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. 4. Commit the changes and open a pull request.
*/ */

65
pkgs/top-level/all-packages.nix
View File

@ -7846,7 +7846,7 @@ with pkgs;
judy = callPackage ../development/libraries/judy { }; judy = callPackage ../development/libraries/judy { };
kdelibs4 = kde5.applications.kdelibs; kdelibs4 = kdeApplications.kdelibs;
keybinder = callPackage ../development/libraries/keybinder { keybinder = callPackage ../development/libraries/keybinder {
automake = automake111x; automake = automake111x;
@ -12791,7 +12791,7 @@ with pkgs;
calligra = kde4.callPackage ../applications/office/calligra { calligra = kde4.callPackage ../applications/office/calligra {
vc = vc_0_7; vc = vc_0_7;
oxygen_icons = kde5.oxygen-icons5; oxygen_icons = libsForQt5.oxygen-icons5;
}; };
camlistore = callPackage ../applications/misc/camlistore { }; camlistore = callPackage ../applications/misc/camlistore { };
@ -14048,17 +14048,29 @@ with pkgs;
kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {}; 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 { }; 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; 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 { }; keepnote = callPackage ../applications/office/keepnote { };
@ -14080,14 +14092,18 @@ with pkgs;
qt = qt4; qt = qt4;
}; };
kile = kde5.callPackage ../applications/editors/kile { }; kile = libsForQt5.callPackage ../applications/editors/kile {
inherit (kdeApplications) konsole;
};
kino = callPackage ../applications/video/kino { kino = callPackage ../applications/video/kino {
inherit (gnome2) libglade; inherit (gnome2) libglade;
ffmpeg = ffmpeg_2; 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 { kiwix = callPackage ../applications/misc/kiwix {
stdenv = overrideCC stdenv gcc49; stdenv = overrideCC stdenv gcc49;
@ -16050,7 +16066,9 @@ with pkgs;
yabar = callPackage ../applications/window-managers/yabar { }; 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 {}; yarp = callPackage ../applications/science/robotics/yarp {};
@ -16210,7 +16228,9 @@ with pkgs;
dhewm3 = callPackage ../games/dhewm3 {}; 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; boost = boost160;
}; };
@ -16779,7 +16799,7 @@ with pkgs;
); );
in recurseIntoAttrs self; in recurseIntoAttrs self;
lumina = qt5.callPackage ../desktops/lumina { }; lumina = libsForQt5.callPackage ../desktops/lumina { };
lxqt = recurseIntoAttrs (import ../desktops/lxqt { lxqt = recurseIntoAttrs (import ../desktops/lxqt {
inherit pkgs libsForQt5 fetchFromGitHub; inherit pkgs libsForQt5 fetchFromGitHub;
@ -16795,11 +16815,16 @@ with pkgs;
pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; 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 { redshift = callPackage ../applications/misc/redshift {
inherit (python3Packages) python pygobject3 pyxdg; 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 {}; orion = callPackage ../misc/themes/orion {};
@ -16813,22 +16838,6 @@ with pkgs;
numix-gtk-theme = callPackage ../misc/themes/numix { }; 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 { }; theme-vertex = callPackage ../misc/themes/vertex { };
rox-filer = callPackage ../desktops/rox/rox-filer { rox-filer = callPackage ../desktops/rox/rox-filer {