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

Merge pull request #23239 from ttuegel/shuffle-kde

Browse Source 
Organize KDE packages correctly
This commit is contained in:
Thomas Tuegel 2017-02-27 11:58:53 -06:00 committed by GitHub
commit 7ef26640f6
251 changed files with 1950 additions and 1882 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
doc/languages-frameworks/qt.xml
View File

@ -2,67 +2,31 @@
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-qt"> xml:id="sec-language-qt">
<title>Qt</title> <title>Qt and KDE</title>
<para>The information in this section applies to Qt 5.5 and later.</para> <para>Qt is a comprehensive desktop and mobile application development toolkit for C++. Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5. The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features, but older versions are typically retained to support packages that may not be compatible with the latest version. When packaging applications and libraries for Nixpkgs, it is important to ensure that compatible versions of Qt 5 are used throughout; this consideration motivates the tools described below.</para>
<para>Qt is an application development toolkit for C++. Although it is
not a distinct programming language, there are special considerations
for packaging Qt-based programs and libraries. A small set of tools
and conventions has grown out of these considerations.</para>
<section xml:id="ssec-qt-libraries"><title>Libraries</title> <section xml:id="ssec-qt-libraries"><title>Libraries</title>
<para>Packages that provide libraries should be listed in <para>Libraries that depend on Qt 5 should be built with each available version to avoid linking a dependent package against incompatible versions of Qt 5. (Although Qt 5 maintains backward ABI compatibility, linking against multiple versions at once is generally not possible; at best it will lead to runtime faults.) Packages that provide libraries should be added to the top-level function <varname>mkLibsForQt5</varname>, which is used to build a set of libraries for every Qt 5 version. The <varname>callPackage</varname> provided in this scope will ensure that only one Qt version will be used throughout the dependency tree. Dependencies should be imported unqualified, i.e. <literal>qtbase</literal> not <literal>qt5.qtbase</literal>, so that <varname>callPackage</varname> can do its work. <emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal> into your package; although it may work fine in the moment, it could well break at the next Qt update.</para>
<varname>qt5LibsFun</varname> so that the library is built with each
Qt version. A set of packages is provided for each version of Qt; for <para>If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its <literal>meta.broken</literal> attribute. A package may be marked broken for certain versions by testing the <literal>qtbase.version</literal> attribute, which will always give the current Qt 5 version.</para>
example, <varname>qt5Libs</varname> always provides libraries built
with the latest version, <varname>qt55Libs</varname> provides
libraries built with Qt 5.5, and so on. To avoid version conflicts, no
top-level attributes are created for these packages.</para>
</section> </section>
<section xml:id="ssec-qt-programs"><title>Programs</title> <section xml:id="ssec-qt-applications"><title>Applications</title>
<para>Application packages do not need to be built with every Qt <para>Applications generally do not need to be built with every Qt version because they do not provide any libraries for dependent packages to link against. The primary consideration is merely ensuring that the application itself and its dependencies are linked against only one version of Qt. To call your application expression, use <literal>libsForQt5.callPackage</literal> instead of <literal>callPackage</literal>. Dependencies should be imported unqualified, i.e. <literal>qtbase</literal> not <literal>qt5.qtbase</literal>. <emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal> into your package; although it may work fine in the moment, it could well break at the next Qt update.</para>
version. To ensure consistency between the package's dependencies,
call the package with <literal>qt5Libs.callPackage</literal> instead
of the usual <literal>callPackage</literal>. An older version may be
selected in case of incompatibility. For example, to build with Qt
5.5, call the package with
<literal>qt55Libs.callPackage</literal>.</para>
<para>Several environment variables must be set at runtime for Qt <para>It is generally best to build an application package against the <varname>libsForQt5</varname> library set. In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that is the latest version the package supports.</para>
applications to function correctly, including:</para>
<itemizedlist> <para>Qt-based applications require that several paths be set at runtime. This is accomplished by wrapping the provided executables in a package with <literal>wrapQtProgram</literal> or <literal>makeQtWrapper</literal> during the <literal>postFixup</literal> phase. To use the wrapper generators, add <literal>makeQtWrapper</literal> to <literal>nativeBuildInputs</literal>. The wrapper generators support the same options as <literal>wrapProgram</literal> and <literal>makeWrapper</literal> respectively. It is usually only necessary to generate wrappers for programs intended to be invoked by the user.</para>
<listitem><para><envar>QT_PLUGIN_PATH</envar></para></listitem>
<listitem><para><envar>QML_IMPORT_PATH</envar></para></listitem>
<listitem><para><envar>QML2_IMPORT_PATH</envar></para></listitem>
<listitem><para><envar>XDG_DATA_DIRS</envar></para></listitem>
</itemizedlist>
<para>To ensure that these are set correctly, the program must be wrapped by
invoking <literal>wrapQtProgram <replaceable>program</replaceable></literal>
during installation (for example, during
<literal>fixupPhase</literal>). <literal>wrapQtProgram</literal>
accepts the same options as <literal>makeWrapper</literal>.
</para>
</section> </section>
<section xml:id="ssec-qt-kde"><title>KDE</title> <section xml:id="ssec-qt-kde"><title>KDE</title>
<para>Many of the considerations above also apply to KDE packages, <para>The KDE Frameworks are a set of libraries for Qt 5 which form the basis of the Plasma desktop environment and the KDE Applications suite. Packaging a Frameworks-based library does not require any steps beyond those described above for general Qt-based libraries. Frameworks-based applications should not use <literal>makeQtWrapper</literal>; instead, use <literal>kdeWrapper</literal> to create the necessary wrappers: <literal>kdeWrapper { unwrapped = <replaceable>expr</replaceable>; targets = <replaceable>exes</replaceable>; }</literal>, where <replaceable>expr</replaceable> is the un-wrapped package expression and <replaceable>exes</replaceable> is a list of strings giving the relative paths to programs in the package which should be wrapped.</para>
especially the need to set the correct environment variables at
runtime. To ensure that this is done, invoke <literal>wrapKDEProgram
<replaceable>program</replaceable></literal> during
installation. <literal>wrapKDEProgram</literal> also generates a
<literal>ksycoca</literal> database so that required data and services
can be found. Like its Qt counterpart,
<literal>wrapKDEProgram</literal> accepts the same options as
<literal>makeWrapper</literal>.</para>
</section> </section>

7
lib/customisation.nix
View File

@ -177,9 +177,10 @@ rec {
let self = f self // { let self = f self // {
newScope = scope: newScope (self // scope); newScope = scope: newScope (self // scope);
callPackage = self.newScope {}; callPackage = self.newScope {};
override = g: makeScope newScope (self_: override = g:
let super = f self_; makeScope newScope
in super // g super self_); (self_: let super = f self_; in super // g super self_);
packages = f;
}; };
in self; in self;

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
''; '';

3
nixos/modules/rename.nix
View File

@ -178,6 +178,9 @@ with lib;
(mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ]) (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ])
(mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ]) (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ])
# KDE Plasma 5
(mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
# Options that are obsolete and have no replacement. # Options that are obsolete and have no replacement.
(mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
(mkRemovedOptionModule [ "programs" "bash" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")

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")}
''); '');
}; };

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

@ -16,9 +16,9 @@ in
{ {
# Note: the order in which desktop manager modules are imported here # Note: the order in which desktop manager modules are imported here
# determines the default: later modules (if enabled) are preferred. # determines the default: later modules (if enabled) are preferred.
# E.g., if KDE is enabled, it supersedes xterm. # E.g., if Plasma 5 is enabled, it supersedes xterm.
imports = [ imports = [
./none.nix ./xterm.nix ./xfce.nix ./kde5.nix ./lumina.nix ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
]; ];

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

@ -1,258 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.kde5;
xorg = pkgs.xorg;
kde5 = pkgs.kde5;
in
{
options = {
services.xserver.desktopManager.kde5 = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable the Plasma 5 (KDE 5) desktop environment.";
};
enableQt4Support = mkOption {
type = types.bool;
default = true;
description = ''
Enable support for Qt 4-based applications. Particularly, install the
Qt 4 version of the Breeze theme and a default backend for Phonon.
'';
};
extraPackages = mkOption {
type = types.listOf types.package;
default = [];
description = ''
KDE packages that need to be installed system-wide.
'';
};
};
};
config = mkMerge [
(mkIf (cfg.extraPackages != []) {
environment.systemPackages = [ (kde5.kdeWrapper cfg.extraPackages) ];
})
(mkIf (xcfg.enable && cfg.enable) {
services.xserver.desktopManager.session = singleton {
name = "kde5";
bgSupport = true;
start = ''
# Load PulseAudio module for routing support.
# See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
${optionalString config.hardware.pulseaudio.enable ''
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
''}
exec "${kde5.startkde}"
'';
};
security.wrappers = {
kcheckpass.source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
"start_kdeinit".source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit";
};
environment.systemPackages =
[
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)
pkgs.hicolor_icon_theme
kde5.kde-gtk-config kde5.breeze-gtk
pkgs.qt5.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 ]
# 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 ];
services.xserver.desktopManager.kde5.extraPackages =
[
kde5.khelpcenter
kde5.oxygen
kde5.dolphin
kde5.konsole
];
environment.pathsToLink = [ "/share" ];
environment.etc = singleton {
source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
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
];
programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass";
# Enable helpful DBus services.
services.udisks2.enable = true;
services.upower.enable = config.powerManagement.enable;
services.dbus.packages =
mkIf config.services.printing.enable [ pkgs.system-config-printer ];
# Extra UDEV rules used by Solid
services.udev.packages = [
pkgs.libmtp
pkgs.media-player-info
];
services.xserver.displayManager.sddm = {
theme = "breeze";
themes = [
kde5.ecm # for the setup-hook
kde5.plasma-workspace
kde5.breeze-icons
];
};
security.pam.services.kde = { allowNullPassword = true; };
# Doing these one by one seems silly, but we currently lack a better
# construct for handling common pam configs.
security.pam.services.gdm.enableKwallet = true;
security.pam.services.kdm.enableKwallet = true;
security.pam.services.lightdm.enableKwallet = true;
security.pam.services.sddm.enableKwallet = true;
security.pam.services.slim.enableKwallet = true;
# use kimpanel as the default IBus panel
i18n.inputMethod.ibus.panel =
lib.mkDefault
"${pkgs.kde5.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

241
nixos/modules/services/x11/desktop-managers/plasma5.nix Normal file
View File

@ -0,0 +1,241 @@
{ config, lib, pkgs, ... }:
with lib;
let
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.plasma5;
inherit (pkgs) kdeWrapper kdeApplications plasma5 libsForQt5 qt5 xorg;
in
{
options = {
services.xserver.desktopManager.plasma5 = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable the Plasma 5 (KDE 5) desktop environment.";
};
enableQt4Support = mkOption {
type = types.bool;
default = true;
description = ''
Enable support for Qt 4-based applications. Particularly, install the
Qt 4 version of the Breeze theme and a default backend for Phonon.
'';
};
extraPackages = mkOption {
type = types.listOf types.package;
default = [];
description = ''
KDE packages that need to be installed system-wide.
'';
};
};
};
config = mkMerge [
(mkIf (cfg.extraPackages != []) {
environment.systemPackages = [ (kdeWrapper cfg.extraPackages) ];
})
(mkIf (xcfg.enable && cfg.enable) {
services.xserver.desktopManager.session = singleton {
name = "plasma5";
bgSupport = true;
start = ''
# Load PulseAudio module for routing support.
# See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
${optionalString config.hardware.pulseaudio.enable ''
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
''}
exec "${plasma5.startkde}"
'';
};
security.wrappers = {
kcheckpass.source = "${plasma5.plasma-workspace.out}/lib/libexec/kcheckpass";
"start_kdeinit".source = "${pkgs.kinit.out}/lib/libexec/kf5/start_kdeinit";
};
environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications;
[
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
kde-gtk-config breeze-gtk
phonon-backend-gstreamer
]
++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ]
# Optional hardware support features
++ 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.plasma5.extraPackages =
with kdeApplications; with plasma5;
[
khelpcenter
oxygen
dolphin
konsole
];
environment.pathsToLink = [ "/share" ];
environment.etc = singleton {
source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
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
]));
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 = "${plasma5.ksshaskpass.out}/bin/ksshaskpass";
# Enable helpful DBus services.
services.udisks2.enable = true;
services.upower.enable = config.powerManagement.enable;
services.dbus.packages =
mkIf config.services.printing.enable [ pkgs.system-config-printer ];
# Extra UDEV rules used by Solid
services.udev.packages = [
pkgs.libmtp
pkgs.media-player-info
];
services.xserver.displayManager.sddm = {
theme = "breeze";
themes = [
pkgs.extra-cmake-modules # for the setup-hook
plasma5.plasma-workspace
pkgs.breeze-icons
];
};
security.pam.services.kde = { allowNullPassword = true; };
# Doing these one by one seems silly, but we currently lack a better
# construct for handling common pam configs.
security.pam.services.gdm.enableKwallet = true;
security.pam.services.kdm.enableKwallet = true;
security.pam.services.lightdm.enableKwallet = true;
security.pam.services.sddm.enableKwallet = true;
security.pam.services.slim.enableKwallet = true;
# use kimpanel as the default IBus panel
i18n.inputMethod.ibus.panel =
lib.mkDefault
"${plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
})
];
}

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

76
pkgs/applications/editors/kile/default.nix
View File

@ -1,28 +1,68 @@
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig { kdeDerivation
, shared_mime_info, kdelibs , lib
, fetchgit
, extra-cmake-modules
, kdoctools
, kdeWrapper
, qtscript
, kconfig
, kcrash
, kdbusaddons
, kdelibs4support
, kguiaddons
, kiconthemes
, kinit
, khtml
, konsole
, kparts
, ktexteditor
, kwindowsystem
, poppler
}: }:
stdenv.mkDerivation rec { let
name = "kile-2.1.3"; unwrapped =
kdeDerivation rec {
name = "kile-${version}";
version = "2017-02-09";
src = fetchgit {
url = git://anongit.kde.org/kile.git;
rev = "f77f6e627487c152f111e307ad6dc71699ade746";
sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
src = fetchurl {
url = "mirror://sourceforge/kile/${name}.tar.bz2";
sha256 = "18nfi37s46v9xav7vyki3phasddgcy4m7nywzxis198vr97yqqx0";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
automoc4 cmake gettext perl pkgconfig shared_mime_info
];
buildInputs = [ kdelibs ];
# for KDE 4.7 the nl translations fail since kile-2.1.2 buildInputs = [
preConfigure = "rm -r translations/nl"; kconfig
kcrash
kdbusaddons
kdelibs4support
kdoctools
kguiaddons
kiconthemes
kinit
khtml
kparts
ktexteditor
kwindowsystem
poppler
qtscript
];
meta = { meta = {
description = "An integrated LaTeX editor for KDE"; description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
homepage = http://kile.sourceforge.net; homepage = https://www.kde.org/applications/office/kile/;
maintainers = [ stdenv.lib.maintainers.urkud ]; maintainers = with lib.maintainers; [ fridh ];
license = stdenv.lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
inherit (kdelibs.meta) platforms;
}; };
};
in
kdeWrapper
{
inherit unwrapped;
targets = [ "bin/kile" ];
paths = [ konsole.unwrapped ];
} }

68
pkgs/applications/editors/kile/frameworks.nix
View File

@ -1,68 +0,0 @@
{ kdeDerivation
, lib
, fetchgit
, ecm
, kdoctools
, kdeWrapper
, qtscript
, kconfig
, kcrash
, kdbusaddons
, kdelibs4support
, kguiaddons
, kiconthemes
, kinit
, khtml
, konsole
, kparts
, ktexteditor
, kwindowsystem
, poppler
}:
let
unwrapped =
kdeDerivation rec {
name = "kile-${version}";
version = "2017-02-09";
src = fetchgit {
url = git://anongit.kde.org/kile.git;
rev = "f77f6e627487c152f111e307ad6dc71699ade746";
sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
};
nativeBuildInputs = [ ecm kdoctools ];
buildInputs = [
kconfig
kcrash
kdbusaddons
kdelibs4support
kdoctools
kguiaddons
kiconthemes
kinit
khtml
kparts
ktexteditor
kwindowsystem
poppler
qtscript
];
meta = {
description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
homepage = https://www.kde.org/applications/office/kile/;
maintainers = with lib.maintainers; [ fridh ];
license = lib.licenses.gpl2Plus;
};
};
in
kdeWrapper
{
inherit unwrapped;
targets = [ "bin/kile" ];
paths = [ konsole.unwrapped ];
}

4
pkgs/applications/graphics/digikam/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, ecm, makeQtWrapper { stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper
# For `digitaglinktree` # For `digitaglinktree`
, perl, sqlite , perl, sqlite
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg"; sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
}; };
nativeBuildInputs = [ cmake ecm makeQtWrapper ]; nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
patches = [ ./0001-Disable-fno-operator-names.patch ]; patches = [ ./0001-Disable-fno-operator-names.patch ];

4
pkgs/applications/graphics/kipi-plugins/default.nix
View File

@ -1,6 +1,6 @@
{ {
stdenv, fetchurl, stdenv, fetchurl,
ecm, extra-cmake-modules,
karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui, karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
libkipi, qtbase, qtsvg, qtxmlpatterns libkipi, qtbase, qtsvg, qtxmlpatterns
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cd extra/kipi-plugins cd extra/kipi-plugins
''; '';
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
qtbase qtsvg qtxmlpatterns qtbase qtsvg qtxmlpatterns

4
pkgs/desktops/kde-5/applications/akonadi-contacts.nix → pkgs/applications/kde/akonadi-contacts.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, extra-cmake-modules,
akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine, akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
akonadi akonadi
}: }:
@ -11,7 +11,7 @@ kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 ]; license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine
]; ];

4
pkgs/desktops/kde-5/applications/akonadi-mime.nix → pkgs/applications/kde/akonadi-mime.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, extra-cmake-modules,
akonadi, kdbusaddons, kio, kitemmodels, kmime akonadi, kdbusaddons, kio, kitemmodels, kmime
}: }:
@ -10,6 +10,6 @@ kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 ]; license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ]; buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ];
} }

4
pkgs/desktops/kde-5/applications/akonadi.nix → pkgs/applications/kde/akonadi.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, extra-cmake-modules,
kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes, kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
kio, kio,
boost, kitemmodels boost, kitemmodels
@ -12,7 +12,7 @@ kdeApp {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
]; ];

20
pkgs/desktops/kde-5/applications/ark/default.nix → pkgs/applications/kde/ark/default.nix
View File

@ -1,13 +1,16 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, config, kdeWrapper,
ecm, kdoctools, makeWrapper, extra-cmake-modules, kdoctools, makeWrapper,
karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio, karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
kservice, kpty, kwidgetsaddons, libarchive, kservice, kpty, kwidgetsaddons, libarchive,
# Archive tools # Archive tools
p7zip, unrar, unzipNLS, zip p7zip, unzipNLS, zip,
# Unfree tools
unfreeEnableUnrar ? false, unrar,
}: }:
let let
@ -15,7 +18,7 @@ let
kdeApp { kdeApp {
name = "ark"; name = "ark";
nativeBuildInputs = [ nativeBuildInputs = [
ecm kdoctools makeWrapper extra-cmake-modules kdoctools makeWrapper
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
@ -23,15 +26,16 @@ let
]; ];
postInstall = postInstall =
let let
PATH = lib.makeBinPath [ PATH =
p7zip unrar unzipNLS zip lib.makeBinPath
]; ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
in '' in ''
wrapProgram "$out/bin/ark" \ wrapProgram "$out/bin/ark" \
--prefix PATH : "${PATH}" --prefix PATH : "${PATH}"
''; '';
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl3 ]; license = with lib.licenses;
[ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
}; };

4
pkgs/desktops/kde-5/applications/baloo-widgets.nix → pkgs/applications/kde/baloo-widgets.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, kdoctools, extra-cmake-modules, kdoctools,
baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice
}: }:
@ -10,7 +10,7 @@ kdeApp {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice
]; ];

0
pkgs/desktops/kde-5/applications/kde-app.nix → pkgs/applications/kde/build-support/application.nix
View File

93
pkgs/applications/kde/default.nix Normal file
View File

@ -0,0 +1,93 @@
/*
# New packages
READ THIS FIRST
This module is for official packages in the KDE Applications Bundle. All
available packages are listed in `./srcs.nix`, although some are not yet
packaged in Nixpkgs (see below).
IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
Many of the packages released upstream are not yet built in Nixpkgs due to lack
of demand. To add a Nixpkgs build for an upstream package, copy one of the
existing packages here and modify it as necessary. A simple example package that
still shows most of the available features is in `./gwenview.nix`.
# Updates
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. Use `nox-review wip` to check that everything builds.
4. Commit the changes and open a pull request.
*/
{
stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs,
kdeDerivation, plasma5,
attica, phonon,
debug ? false,
}:
let
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; };
in
let
packages = self: with self;
let
callPackage = self.newScope {
kdeApp = import ./build-support/application.nix {
inherit lib kdeDerivation;
inherit debug srcs;
};
};
in {
kdelibs = callPackage ./kdelibs { inherit attica phonon; };
akonadi = callPackage ./akonadi.nix {};
akonadi-contacts = callPackage ./akonadi-contacts.nix {};
akonadi-mime = callPackage ./akonadi-mime.nix {};
ark = callPackage ./ark/default.nix {};
baloo-widgets = callPackage ./baloo-widgets.nix {};
dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
filelight = callPackage ./filelight.nix {};
gwenview = callPackage ./gwenview.nix {};
kate = callPackage ./kate.nix {};
kdenlive = callPackage ./kdenlive.nix {};
kcalc = callPackage ./kcalc.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {};
kcontacts = callPackage ./kcontacts.nix {};
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
kdf = callPackage ./kdf.nix {};
kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
kig = callPackage ./kig.nix {};
kio-extras = callPackage ./kio-extras.nix {};
kmime = callPackage ./kmime.nix {};
kmix = callPackage ./kmix.nix {};
kompare = callPackage ./kompare.nix {};
konsole = callPackage ./konsole.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};
libkdcraw = callPackage ./libkdcraw.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
libkipi = callPackage ./libkipi.nix {};
libkomparediff2 = callPackage ./libkomparediff2.nix {};
marble = callPackage ./marble.nix {};
okteta = callPackage ./okteta.nix {};
okular = callPackage ./okular.nix {};
print-manager = callPackage ./print-manager.nix {};
spectacle = callPackage ./spectacle.nix {};
l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
};
in lib.makeScope libsForQt5.newScope packages

4
pkgs/desktops/kde-5/applications/dolphin-plugins.nix → pkgs/applications/kde/dolphin-plugins.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, kdoctools, extra-cmake-modules, kdoctools,
dolphin, kdelibs4support, ki18n, kio, kxmlgui dolphin, kdelibs4support, ki18n, kio, kxmlgui
}: }:
@ -10,7 +10,7 @@ kdeApp {
license = [ lib.licenses.gpl2 ]; license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
dolphin.unwrapped kdelibs4support ki18n kio kxmlgui dolphin.unwrapped kdelibs4support ki18n kio kxmlgui
]; ];

4
pkgs/desktops/kde-5/applications/dolphin.nix → pkgs/applications/kde/dolphin.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, makeQtWrapper, extra-cmake-modules, kdoctools, makeQtWrapper,
baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils, baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
@ -15,7 +15,7 @@ let
license = with lib.licenses; [ gpl2 fdl12 ]; license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
propagatedBuildInputs = [ propagatedBuildInputs = [
baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes

0
pkgs/desktops/kde-5/applications/fetch.sh → pkgs/applications/kde/fetch.sh
View File

4
pkgs/desktops/kde-5/applications/ffmpegthumbs.nix → pkgs/applications/kde/ffmpegthumbs.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, extra-cmake-modules,
ffmpeg, kio ffmpeg, kio
}: }:
@ -10,6 +10,6 @@ kdeApp {
license = with lib.licenses; [ gpl2 bsd3 ]; license = with lib.licenses; [ gpl2 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ ffmpeg kio ]; propagatedBuildInputs = [ ffmpeg kio ];
} }

4
pkgs/desktops/kde-5/applications/filelight.nix → pkgs/applications/kde/filelight.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
kio, kparts, kxmlgui, qtscript, solid kio, kparts, kxmlgui, qtscript, solid
}: }:
@ -12,7 +12,7 @@ let
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh vcunat ]; maintainers = with lib.maintainers; [ fridh vcunat ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kio kparts kxmlgui qtscript solid kio kparts kxmlgui qtscript solid
]; ];

4
pkgs/desktops/kde-5/applications/gwenview.nix → pkgs/applications/kde/gwenview.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2, baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
}: }:
@ -13,7 +13,7 @@ let
license = with lib.licenses; [ gpl2 fdl12 ]; license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
libkipi phonon qtimageformats qtsvg qtx11extras libkipi phonon qtimageformats qtsvg qtx11extras

4
pkgs/desktops/kde-5/applications/kate.nix → pkgs/applications/kde/kate.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n, kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole, kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2, kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
@ -15,7 +15,7 @@ let
license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kactivities ki18n kio ktexteditor kwindowsystem plasma-framework kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts

4
pkgs/desktops/kde-5/applications/kcalc.nix → pkgs/applications/kde/kcalc.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
}: }:
@ -12,7 +12,7 @@ let
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.fridh ]; maintainers = [ lib.maintainers.fridh ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gmp kconfig kconfigwidgets kguiaddons kinit knotifications gmp kconfig kconfigwidgets kguiaddons kinit knotifications
]; ];

4
pkgs/desktops/kde-5/applications/kcolorchooser.nix → pkgs/applications/kde/kcolorchooser.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, ki18n, kwidgetsaddons, kxmlgui extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui
}: }:
let let
@ -11,7 +11,7 @@ let
license = with lib.licenses; [ mit ]; license = with lib.licenses; [ mit ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ]; propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
}; };
in in

4
pkgs/desktops/kde-5/applications/kcontacts.nix → pkgs/applications/kde/kcontacts.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, ki18n, extra-cmake-modules, ki18n,
kcoreaddons, kconfig, kcodecs kcoreaddons, kconfig, kcodecs
}: }:
@ -10,6 +10,6 @@ kdeApp {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ki18n ]; nativeBuildInputs = [ extra-cmake-modules ki18n ];
buildInputs = [ kcoreaddons kconfig kcodecs ]; buildInputs = [ kcoreaddons kconfig kcodecs ];
} }

0
pkgs/desktops/kde-5/applications/kde-locale-4.nix → pkgs/applications/kde/kde-locale-4.nix
View File

4
pkgs/desktops/kde-5/applications/kde-locale-5.nix → pkgs/applications/kde/kde-locale-5.nix
View File

@ -1,6 +1,6 @@
name: args: name: args:
{ kdeApp, cmake, ecm, gettext, kdoctools }: { kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
kdeApp (args // { kdeApp (args // {
sname = "kde-l10n-${name}"; sname = "kde-l10n-${name}";
@ -9,7 +9,7 @@ kdeApp (args // {
outputs = [ "out" ]; outputs = [ "out" ];
nativeBuildInputs = nativeBuildInputs =
[ cmake ecm gettext kdoctools ] [ cmake extra-cmake-modules gettext kdoctools ]
++ (args.nativeBuildInputs or []); ++ (args.nativeBuildInputs or []);
preConfigure = '' preConfigure = ''

4
pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix → pkgs/applications/kde/kdegraphics-mobipocket.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, extra-cmake-modules,
kio kio
}: }:
@ -10,6 +10,6 @@ kdeApp {
license = [ lib.licenses.gpl2Plus ]; license = [ lib.licenses.gpl2Plus ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kio ]; buildInputs = [ kio ];
} }

4
pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix → pkgs/applications/kde/kdegraphics-thumbnailers.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, kio, libkexiv2, libkdcraw extra-cmake-modules, kio, libkexiv2, libkdcraw
}: }:
kdeApp { kdeApp {
@ -9,6 +9,6 @@ kdeApp {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kio libkexiv2 libkdcraw ]; propagatedBuildInputs = [ kio libkexiv2 libkdcraw ];
} }

0
pkgs/desktops/kde-5/applications/kdelibs/0001-old-kde4-cmake-policies.patch → pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch
View File

0
pkgs/desktops/kde-5/applications/kdelibs/0002-polkit-install-path.patch → pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch
View File

0
pkgs/desktops/kde-5/applications/kdelibs/0003-remove_xdg_impurities.patch → pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch
View File

2
pkgs/desktops/kde-5/applications/kdelibs/default.nix → pkgs/applications/kde/kdelibs/default.nix
View File

@ -1,5 +1,5 @@
{ {
kdeApp, lib, src, version, kdeApp, lib,
automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info, automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase, attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4, libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,

4
pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix → pkgs/applications/kde/kdenetwork-filesharing.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, kdoctools, extra-cmake-modules, kdoctools,
kcoreaddons, ki18n, kio, kwidgetsaddons, samba kcoreaddons, ki18n, kio, kwidgetsaddons, samba
}: }:
@ -10,6 +10,6 @@ kdeApp {
license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ]; propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
} }

0
pkgs/desktops/kde-5/applications/kdenlive.nix → pkgs/applications/kde/kdenlive.nix
View File

4
pkgs/desktops/kde-5/applications/kdf.nix → pkgs/applications/kde/kdf.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
kcmutils kcmutils
}: }:
@ -12,7 +12,7 @@ let
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.peterhoeg ]; maintainers = [ lib.maintainers.peterhoeg ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kcmutils kcmutils
]; ];

4
pkgs/desktops/kde-5/applications/kgpg.nix → pkgs/applications/kde/kgpg.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, kdoctools, ki18n, extra-cmake-modules, kdoctools, ki18n,
akonadi-contacts, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash, akonadi-contacts, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
@ -8,7 +8,7 @@
kdeApp { kdeApp {
name = "kgpg"; name = "kgpg";
nativeBuildInputs = [ ecm kdoctools ki18n ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ];
buildInputs = [ buildInputs = [
akonadi-contacts gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons akonadi-contacts gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui

4
pkgs/desktops/kde-5/applications/khelpcenter.nix → pkgs/applications/kde/khelpcenter.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, kdeWrapper, kdeApp, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
kdelibs4support, khtml, kservice, xapian kdelibs4support, khtml, kservice, xapian
}: }:
@ -9,7 +9,7 @@ let
unwrapped = unwrapped =
kdeApp { kdeApp {
name = "khelpcenter"; name = "khelpcenter";
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
kinit kcmutils kservice xapian kinit kcmutils kservice xapian

4
pkgs/desktops/kde-5/applications/kig.nix → pkgs/applications/kde/kig.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper kdeApp, lib, kdeWrapper
, ecm, kdoctools, kparts , extra-cmake-modules, kdoctools, kparts
, qtsvg, qtxmlpatterns, ktexteditor, boost , qtsvg, qtxmlpatterns, ktexteditor, boost
}: }:
@ -12,7 +12,7 @@ let
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ raskin ]; maintainers = with lib.maintainers; [ raskin ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
kparts qtsvg qtxmlpatterns ktexteditor boost kparts qtsvg qtxmlpatterns ktexteditor boost
]; ];

4
pkgs/desktops/kde-5/applications/kio-extras.nix → pkgs/applications/kde/kio-extras.nix
View File

@ -1,5 +1,5 @@
{ {
kdeApp, lib, ecm, kdoctools, shared_mime_info, kdeApp, lib, extra-cmake-modules, kdoctools, shared_mime_info,
exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml,
kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon,
@ -12,7 +12,7 @@ kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 ]; license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm kdoctools shared_mime_info ]; nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
propagatedBuildInputs = [ propagatedBuildInputs = [
exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support

4
pkgs/desktops/kde-5/applications/kmime.nix → pkgs/applications/kde/kmime.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeApp, lib,
ecm, ki18n, extra-cmake-modules, ki18n,
kcodecs kcodecs
}: }:
@ -10,6 +10,6 @@ kdeApp {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ki18n ]; nativeBuildInputs = [ extra-cmake-modules ki18n ];
buildInputs = [ kcodecs ]; buildInputs = [ kcodecs ];
} }

4
pkgs/desktops/kde-5/applications/kmix.nix → pkgs/applications/kde/kmix.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support, kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
plasma-framework, libpulseaudio, alsaLib, libcanberra_kde plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
}: }:
@ -13,7 +13,7 @@ let
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.rongcuid ]; maintainers = [ lib.maintainers.rongcuid ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ libpulseaudio alsaLib libcanberra_kde ]; buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kglobalaccel kxmlgui kcoreaddons kdelibs4support kglobalaccel kxmlgui kcoreaddons kdelibs4support

4
pkgs/desktops/kde-5/applications/kompare.nix → pkgs/applications/kde/kompare.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
kparts, ktexteditor, kwidgetsaddons, libkomparediff2 kparts, ktexteditor, kwidgetsaddons, libkomparediff2
}: }:
@ -9,7 +9,7 @@ let
kdeApp { kdeApp {
name = "kompare"; name = "kompare";
meta = { license = with lib.licenses; [ gpl2 ]; }; meta = { license = with lib.licenses; [ gpl2 ]; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kparts ktexteditor kwidgetsaddons libkomparediff2 kparts ktexteditor kwidgetsaddons libkomparediff2
]; ];

4
pkgs/desktops/kde-5/applications/konsole.nix → pkgs/applications/kde/konsole.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons, knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
@ -15,7 +15,7 @@ let
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio

4
pkgs/desktops/kde-5/applications/kwalletmanager.nix → pkgs/applications/kde/kwalletmanager.nix
View File

@ -1,7 +1,7 @@
{ lib { lib
, kdeApp , kdeApp
, kdeWrapper , kdeWrapper
, ecm , extra-cmake-modules
, kdoctools , kdoctools
, kauth , kauth
, kcmutils , kcmutils
@ -19,7 +19,7 @@ let
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh ]; maintainers = with lib.maintainers; [ fridh ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kauth kauth
kcmutils kcmutils

4
pkgs/desktops/kde-5/applications/l10n.nix → pkgs/applications/kde/l10n.nix
View File

@ -1,4 +1,4 @@
{ callPackage, pkgs, lib }: { callPackage, recurseIntoAttrs, lib }:
let let
@ -7,7 +7,7 @@ let
in in
lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) { lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
ar = { ar = {
qt4 = callPackage (kdeLocale4 "ar" {}) {}; qt4 = callPackage (kdeLocale4 "ar" {}) {};
qt5 = callPackage (kdeLocale5 "ar" {}) {}; qt5 = callPackage (kdeLocale5 "ar" {}) {};

5
pkgs/desktops/kde-5/applications/libkdcraw.nix → pkgs/applications/kde/libkdcraw.nix
View File

@ -1,4 +1,4 @@
{ kdeApp, lib, ecm, libraw }: { kdeApp, lib, extra-cmake-modules, libraw, qtbase }:
kdeApp { kdeApp {
name = "libkdcraw"; name = "libkdcraw";
@ -6,6 +6,7 @@ kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ libraw ]; propagatedBuildInputs = [ libraw ];
} }

5
pkgs/desktops/kde-5/applications/libkexiv2.nix → pkgs/applications/kde/libkexiv2.nix
View File

@ -1,4 +1,4 @@
{ kdeApp, lib, exiv2, ecm }: { kdeApp, lib, exiv2, extra-cmake-modules, qtbase }:
kdeApp { kdeApp {
name = "libkexiv2"; name = "libkexiv2";
@ -6,6 +6,7 @@ kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ exiv2 ]; propagatedBuildInputs = [ exiv2 ];
} }

4
pkgs/desktops/kde-5/applications/libkipi.nix → pkgs/applications/kde/libkipi.nix
View File

@ -1,4 +1,4 @@
{ kdeApp, lib, ecm, kconfig, ki18n, kservice, kxmlgui }: { kdeApp, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }:
kdeApp { kdeApp {
name = "libkipi"; name = "libkipi";
@ -6,6 +6,6 @@ kdeApp {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ]; propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ];
} }

7
pkgs/applications/kde/libkomparediff2.nix Normal file
View File

@ -0,0 +1,7 @@
{ kdeApp, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
kdeApp {
name = "libkomparediff2";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ];
}

4
pkgs/desktops/kde-5/applications/marble.nix → pkgs/applications/kde/marble.nix
View File

@ -1,5 +1,5 @@
{ kdeApp, lib, kdeWrapper { kdeApp, lib, kdeWrapper
, ecm, qtscript, qtsvg, qtquickcontrols , extra-cmake-modules, qtscript, qtsvg, qtquickcontrols
, gpsd , gpsd
}: }:
@ -9,7 +9,7 @@ let
name = "marble"; name = "marble";
meta.license = with lib.licenses; [ lgpl21 gpl3 ]; meta.license = with lib.licenses; [ lgpl21 gpl3 ];
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ propagatedBuildInputs = [
qtscript qtsvg qtquickcontrols qtscript qtsvg qtquickcontrols
gpsd gpsd

4
pkgs/desktops/kde-5/applications/okteta.nix → pkgs/applications/kde/okteta.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
kconfig, kinit, kconfig, kinit,
kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5 kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
}: }:
@ -13,7 +13,7 @@ let
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ peterhoeg ]; maintainers = with lib.maintainers; [ peterhoeg ];
}; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kconfig kinit kconfig kinit
kcmutils kconfigwidgets knewstuff kparts qca-qt5 kcmutils kconfigwidgets knewstuff kparts qca-qt5

4
pkgs/desktops/kde-5/applications/okular.nix → pkgs/applications/kde/okular.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
@ -10,7 +10,7 @@
let let
unwrapped = kdeApp { unwrapped = kdeApp {
name = "okular"; name = "okular";
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes

4
pkgs/desktops/kde-5/applications/print-manager.nix → pkgs/applications/kde/print-manager.nix
View File

@ -1,5 +1,5 @@
{ {
kdeApp, lib, ecm, kdeApp, lib, extra-cmake-modules,
cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio, cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework, knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
qtdeclarative qtdeclarative
@ -11,7 +11,7 @@ kdeApp {
license = [ lib.licenses.gpl2 ]; license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ ecm ]; nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ propagatedBuildInputs = [
cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework

4
pkgs/desktops/kde-5/applications/spectacle.nix → pkgs/applications/kde/spectacle.nix
View File

@ -1,6 +1,6 @@
{ {
kdeApp, lib, kdeWrapper, kdeApp, lib, kdeWrapper,
ecm, kdoctools, extra-cmake-modules, kdoctools,
kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins, kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
xcb-util-cursor xcb-util-cursor
@ -11,7 +11,7 @@ let
kdeApp { kdeApp {
name = "spectacle"; name = "spectacle";
meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor

0
pkgs/desktops/kde-5/applications/srcs.nix → pkgs/applications/kde/srcs.nix
View File

4
pkgs/applications/misc/krename/default.nix
View File

@ -1,6 +1,6 @@
{ {
kdeDerivation, kdeWrapper, fetchFromGitHub, lib, kdeDerivation, kdeWrapper, fetchFromGitHub, lib,
ecm, kdoctools, kconfig, kinit, kjsembed, extra-cmake-modules, kdoctools, kconfig, kinit, kjsembed,
taglib, exiv2, podofo taglib, exiv2, podofo
}: }:
@ -25,7 +25,7 @@ let
}; };
buildInputs = [ taglib exiv2 podofo ]; buildInputs = [ taglib exiv2 podofo ];
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kconfig kinit kjsembed ]; propagatedBuildInputs = [ kconfig kinit kjsembed ];
}; };

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
]; ];

4
pkgs/applications/misc/yakuake/default.nix
View File

@ -3,7 +3,7 @@
, fetchurl , fetchurl
, kdoctools , kdoctools
, kdeWrapper , kdeWrapper
, ecm , extra-cmake-modules
, karchive , karchive
, kcrash , kcrash
, kdbusaddons , kdbusaddons
@ -43,7 +43,7 @@ let
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
ecm kdoctools extra-cmake-modules kdoctools
]; ];
meta = { meta = {

4
pkgs/applications/networking/irc/konversation/default.nix
View File

@ -1,7 +1,7 @@
{ kdeDerivation { kdeDerivation
, lib , lib
, fetchurl , fetchurl
, ecm , extra-cmake-modules
, kbookmarks , kbookmarks
, karchive , karchive
, kconfig , kconfig
@ -64,7 +64,7 @@ let
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
ecm extra-cmake-modules
kdoctools kdoctools
]; ];

4
pkgs/applications/networking/p2p/ktorrent/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake { stdenv, fetchurl, cmake
, ecm, qtbase, qtscript , extra-cmake-modules, qtbase, qtscript
, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support , ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
, libktorrent, boost, taglib , libktorrent, boost, taglib
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ kdoctools ecm ]; nativeBuildInputs = [ kdoctools extra-cmake-modules ];
buildInputs = buildInputs =
[ cmake qtbase qtscript [ cmake qtbase qtscript

4
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
, libssh, zlib, cmake, ecm , libssh, zlib, cmake, extra-cmake-modules
, withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null , withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
, withQt ? false, qt5 ? null , withQt ? false, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp , ApplicationServices, SystemConfiguration, gmp
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
}; };
buildInputs = [ buildInputs = [
bison cmake ecm flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls bison cmake extra-cmake-modules flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls
geoip c-ares python glib zlib geoip c-ares python glib zlib
] ++ (optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])) ] ++ (optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]))
++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ]) ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ])

4
pkgs/applications/office/calligra/default.nix
View File

@ -2,7 +2,7 @@
, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg , exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql , libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs , freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
, kactivities, okular, git, oxygen_icons, makeWrapper , kactivities, okular, git, oxygen-icons5, makeWrapper
# TODO: not found # TODO: not found
#, xbase, openjpeg #, xbase, openjpeg
# TODO: package libWPS, Spnav, m2mml, LibEtonyek # TODO: package libWPS, Spnav, m2mml, LibEtonyek
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
for i in $out/bin/*; do for i in $out/bin/*; do
wrapProgram $i \ wrapProgram $i \
--prefix PATH ':' "${pstoedit.out}/bin" \ --prefix PATH ':' "${pstoedit.out}/bin" \
--prefix XDG_DATA_DIRS ':' "${oxygen_icons}/share" --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share"
done done
''; '';

4
pkgs/applications/office/skrooge/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, ecm, makeQtWrapper, qtwebkit, qtscript, grantlee, { stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper, qtwebkit, qtscript, grantlee,
kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities, kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities,
knotifyconfig, krunner, libofx }: knotifyconfig, krunner, libofx }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x"; sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
}; };
nativeBuildInputs = [ cmake ecm makeQtWrapper ]; nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5 kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5

17
pkgs/build-support/kde/derivation.nix Normal file
View File

@ -0,0 +1,17 @@
{ stdenv, lib, debug ? false }:
args:
stdenv.mkDerivation (args // {
outputs = args.outputs or [ "out" "dev" ];
propagatedUserEnvPkgs =
builtins.map lib.getBin (args.propagatedBuildInputs or []);
cmakeFlags =
(args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
})

0
pkgs/development/libraries/kde-frameworks/kde-wrapper.nix → pkgs/build-support/kde/wrapper.nix
View File

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

@ -1,93 +0,0 @@
/*
# New packages
READ THIS FIRST
This module is for official packages in the KDE Applications Bundle. All
available packages are listed in `./srcs.nix`, although some are not yet
packaged in Nixpkgs (see below).
IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
Many of the packages released upstream are not yet built in Nixpkgs due to lack
of demand. To add a Nixpkgs build for an upstream package, copy one of the
existing packages here and modify it as necessary. A simple example package that
still shows most of the available features is in `./gwenview.nix`.
# Updates
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.
4. Commit the changes and open a pull request.
*/
{ pkgs, debug ? false }:
let
inherit (pkgs) lib stdenv;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
packages = self: with self; {
kdeApp = import ./kde-app.nix {
inherit lib;
inherit debug srcs;
inherit kdeDerivation;
};
kdelibs = callPackage ./kdelibs {
inherit (srcs.kdelibs) src version;
inherit (pkgs) attica phonon;
};
akonadi = callPackage ./akonadi.nix {};
akonadi-contacts = callPackage ./akonadi-contacts.nix {};
akonadi-mime = callPackage ./akonadi-mime.nix {};
ark = callPackage ./ark/default.nix {};
baloo-widgets = callPackage ./baloo-widgets.nix {};
dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix {
ffmpeg = pkgs.ffmpeg_2;
};
filelight = callPackage ./filelight.nix {};
gwenview = callPackage ./gwenview.nix {};
kate = callPackage ./kate.nix {};
kdenlive = callPackage ./kdenlive.nix {};
kcalc = callPackage ./kcalc.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {};
kcontacts = callPackage ./kcontacts.nix {};
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
kdf = callPackage ./kdf.nix {};
kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
kig = callPackage ./kig.nix {};
kio-extras = callPackage ./kio-extras.nix {};
kmime = callPackage ./kmime.nix {};
kmix = callPackage ./kmix.nix {};
kompare = callPackage ./kompare.nix {};
konsole = callPackage ./konsole.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};
libkdcraw = callPackage ./libkdcraw.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
libkipi = callPackage ./libkipi.nix {};
libkomparediff2 = callPackage ./libkomparediff2.nix {};
marble = callPackage ./marble.nix {};
okteta = callPackage ./okteta.nix {};
okular = callPackage ./okular.nix {};
print-manager = callPackage ./print-manager.nix {};
spectacle = callPackage ./spectacle.nix {};
l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
};
in packages

7
pkgs/desktops/kde-5/applications/libkomparediff2.nix
View File

@ -1,7 +0,0 @@
{ kdeApp, lib, ecm, ki18n, kxmlgui, kcodecs, kio }:
kdeApp {
name = "libkomparediff2";
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ];
}

24
pkgs/desktops/kde-5/plasma/breeze-qt4.nix
View File

@ -1,24 +0,0 @@
{
stdenv, lib, src, version,
automoc4, cmake, perl, pkgconfig,
kdelibs, qt4, xproto
}:
stdenv.mkDerivation {
name = "breeze-qt4-${version}";
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
};
inherit src;
buildInputs = [ kdelibs qt4 xproto ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
cmakeFlags = [
"-DUSE_KDE4=ON"
"-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
];
}

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

@ -1,99 +0,0 @@
/*
# New packages
READ THIS FIRST
This module is for official packages in KDE Plasma 5. All available packages are
listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see
below).
IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
Many of the packages released upstream are not yet built in Nixpkgs due to lack
of demand. To add a Nixpkgs build for an upstream package, copy one of the
existing packages here and modify it as necessary.
# Updates
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.
4. Commit the changes and open a pull request.
*/
{ pkgs, debug ? false }:
let
inherit (pkgs) lib makeSetupHook stdenv symlinkJoin;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
packages = self: with self; {
plasmaPackage = args:
let
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
in kdeDerivation (args // {
name = "${name}-${version}";
inherit src;
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
} // (args.meta or {});
});
bluedevil = callPackage ./bluedevil.nix {};
breeze-gtk = callPackage ./breeze-gtk.nix {};
breeze-qt4 = callPackage ./breeze-qt4.nix {
inherit (srcs.breeze) src version;
};
breeze-qt5 = callPackage ./breeze-qt5.nix {};
breeze-grub = callPackage ./breeze-grub.nix {};
breeze-plymouth = callPackage ./breeze-plymouth {};
kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
kde-cli-tools = callPackage ./kde-cli-tools.nix {};
kde-gtk-config = callPackage ./kde-gtk-config {};
kdecoration = callPackage ./kdecoration.nix {};
kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
kgamma5 = callPackage ./kgamma5.nix {};
khotkeys = callPackage ./khotkeys.nix {};
kinfocenter = callPackage ./kinfocenter.nix {};
kmenuedit = callPackage ./kmenuedit.nix {};
kscreen = callPackage ./kscreen.nix {};
kscreenlocker = callPackage ./kscreenlocker.nix {};
ksshaskpass = callPackage ./ksshaskpass.nix {};
ksysguard = callPackage ./ksysguard.nix {};
kwallet-pam = callPackage ./kwallet-pam.nix {};
kwayland-integration = callPackage ./kwayland-integration.nix {};
kwin = callPackage ./kwin {};
kwrited = callPackage ./kwrited.nix {};
libkscreen = callPackage ./libkscreen.nix {};
libksysguard = callPackage ./libksysguard {};
milou = callPackage ./milou.nix {};
oxygen = callPackage ./oxygen.nix {};
plasma-desktop = callPackage ./plasma-desktop {};
plasma-integration = callPackage ./plasma-integration.nix {};
plasma-nm = callPackage ./plasma-nm {};
plasma-pa = callPackage ./plasma-pa.nix {
inherit (pkgs.gnome3) gconf;
};
plasma-workspace = callPackage ./plasma-workspace {};
plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
powerdevil = callPackage ./powerdevil.nix {};
startkde = callPackage ./startkde {};
systemsettings = callPackage ./systemsettings.nix {};
};
in packages

1
pkgs/desktops/kde-5/plasma/fetch.sh
View File

@ -1 +0,0 @@
WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.5/ -A '*.tar.xz' )

6
pkgs/desktops/kde-5/plasma/kdecoration.nix
View File

@ -1,6 +0,0 @@
{ plasmaPackage, ecm }:
plasmaPackage {
name = "kdecoration";
nativeBuildInputs = [ ecm ];
}

9
pkgs/desktops/kde-5/plasma/kgamma5.nix
View File

@ -1,9 +0,0 @@
{ plasmaPackage, ecm, kdoctools, kdelibs4support
, qtx11extras
}:
plasmaPackage {
name = "kgamma5";
nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [ kdelibs4support qtx11extras ];
}

22
pkgs/desktops/kde-5/plasma/khotkeys.nix
View File

@ -1,22 +0,0 @@
{ plasmaPackage, ecm, kdoctools, kcmutils
, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
, plasma-framework, plasma-workspace, qtx11extras
, fetchpatch
}:
plasmaPackage {
name = "khotkeys";
nativeBuildInputs = [ ecm kdoctools ];
patches = [
# Patch is in 5.9 and up.
(fetchpatch {
url = "https://cgit.kde.org/khotkeys.git/patch/?id=f8f7eaaf41e2b95ebfa4b2e35c6ee252524a471b";
sha256 = "1wxx3qv16jd623jh728xcda8i4y1daq25skwilhv4cfvqxyzk7nn";
})
];
propagatedBuildInputs = [
kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
qtx11extras kcmutils kdbusaddons kxmlgui
];
}

11
pkgs/desktops/kde-5/plasma/kwallet-pam.nix
View File

@ -1,11 +0,0 @@
{ plasmaPackage, ecm, pam, socat, libgcrypt
}:
plasmaPackage {
name = "kwallet-pam";
nativeBuildInputs = [ ecm ];
buildInputs = [ pam socat libgcrypt ];
}

325
pkgs/desktops/kde-5/plasma/srcs.nix
View File

@ -1,325 +0,0 @@
# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
{ fetchurl, mirror }:
{
bluedevil = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/bluedevil-5.8.5.tar.xz";
sha256 = "07gj3m5f0rk26n0xm4yddsfny6l2sh0airm45hb33p7m5inaqzgv";
name = "bluedevil-5.8.5.tar.xz";
};
};
breeze = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/breeze-5.8.5.tar.xz";
sha256 = "1gcns00iq7a5f1a0w6vf8zck669gzcd785fiybnvc6s6q8x4bp61";
name = "breeze-5.8.5.tar.xz";
};
};
breeze-grub = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/breeze-grub-5.8.5.tar.xz";
sha256 = "12ynrxdfcraphbwv9yrfhvwf3xkzrw0raqvgi7ksz5cvh78kl5qf";
name = "breeze-grub-5.8.5.tar.xz";
};
};
breeze-gtk = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/breeze-gtk-5.8.5.tar.xz";
sha256 = "15dx5hl9w9fiash30vgkbww6h7hck0dr42hh8gzysn0xyf0fzpgd";
name = "breeze-gtk-5.8.5.tar.xz";
};
};
breeze-plymouth = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/breeze-plymouth-5.8.5.tar.xz";
sha256 = "1ryb2jrzw0bzpi7ig4h5k0i33d2qviqsjxw7mnqxcb9q49a4ziq1";
name = "breeze-plymouth-5.8.5.tar.xz";
};
};
discover = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/discover-5.8.5.tar.xz";
sha256 = "0fr6mksqw46aghfzj78nlq3f89xd63vq2hr4c3gb4vkl5y8v08hg";
name = "discover-5.8.5.tar.xz";
};
};
kactivitymanagerd = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kactivitymanagerd-5.8.5.tar.xz";
sha256 = "07cqnbyznn5wy7vrqyid8h5ah7h3sb3pb30qlm83b4m29bkhggwh";
name = "kactivitymanagerd-5.8.5.tar.xz";
};
};
kde-cli-tools = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kde-cli-tools-5.8.5.tar.xz";
sha256 = "1ig9x5h9xkzis9izggkjpiiy4sm77pk347jdngx01qpacz68iyp7";
name = "kde-cli-tools-5.8.5.tar.xz";
};
};
kdecoration = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kdecoration-5.8.5.tar.xz";
sha256 = "1vhw57pj9i5224i9irk4qmingvkg5bip11vsqiwhmn5307bpnfiq";
name = "kdecoration-5.8.5.tar.xz";
};
};
kde-gtk-config = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kde-gtk-config-5.8.5.tar.xz";
sha256 = "1j0mzmmdhqd3a8papps6cad0gqn081mc4kqzi2hjai7038l6951r";
name = "kde-gtk-config-5.8.5.tar.xz";
};
};
kdeplasma-addons = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kdeplasma-addons-5.8.5.tar.xz";
sha256 = "181kagb4nbl9a7akk79slwkb7m2j4vyhabagih0z8l45wl5wrz9d";
name = "kdeplasma-addons-5.8.5.tar.xz";
};
};
kgamma5 = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kgamma5-5.8.5.tar.xz";
sha256 = "073z4w4i2hwsqqgxcfl0w8d57nhzc069h9zwp7fv93aaw4mgzci2";
name = "kgamma5-5.8.5.tar.xz";
};
};
khotkeys = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/khotkeys-5.8.5.tar.xz";
sha256 = "1fh0z9vfb908nbwj3snkf9z55jbcb5id87k5sa0v8dhazmp91ylh";
name = "khotkeys-5.8.5.tar.xz";
};
};
kinfocenter = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kinfocenter-5.8.5.tar.xz";
sha256 = "1fksnb9klbcrr9ly6dd2yx5y1ngcwcln43zykpc76pr4i49jpggp";
name = "kinfocenter-5.8.5.tar.xz";
};
};
kmenuedit = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kmenuedit-5.8.5.tar.xz";
sha256 = "1vq5f69w75lj81nz75db88lqxc4zvhicd5w7r6k7amggnwxm9f3m";
name = "kmenuedit-5.8.5.tar.xz";
};
};
kscreen = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kscreen-5.8.5.tar.xz";
sha256 = "069x3vsfqirmq8r7yfa68srhjvygdwsxcj0b4vvb7zivs29zn1mh";
name = "kscreen-5.8.5.tar.xz";
};
};
kscreenlocker = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kscreenlocker-5.8.5.tar.xz";
sha256 = "11b2v3chhk1ma5kjbmf35qahfr8gbaw78mcqs8vw5m9x74vlimkj";
name = "kscreenlocker-5.8.5.tar.xz";
};
};
ksshaskpass = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/ksshaskpass-5.8.5.tar.xz";
sha256 = "1gr48f4akrn0yhlnjw4yaas6ah5z40fb8iz06gi1dzry5axfmaxh";
name = "ksshaskpass-5.8.5.tar.xz";
};
};
ksysguard = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/ksysguard-5.8.5.tar.xz";
sha256 = "1gd81y2a459j5k1mpikfrvwcz7v09m526nrl7kpr4l4a1ps8zfy9";
name = "ksysguard-5.8.5.tar.xz";
};
};
kwallet-pam = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kwallet-pam-5.8.5.tar.xz";
sha256 = "0310vr3p9fxl3vwdgklk0acx6w31pcpq8mi9yldahg1mkjqf7l44";
name = "kwallet-pam-5.8.5.tar.xz";
};
};
kwayland-integration = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kwayland-integration-5.8.5.tar.xz";
sha256 = "11f63mq7crsbrpdib16q8xg0hk8jr5x1cyv43q8qdqm0591cglli";
name = "kwayland-integration-5.8.5.tar.xz";
};
};
kwin = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kwin-5.8.5.tar.xz";
sha256 = "182z17d4sad9j15qagx9yz13wwzcyy6hlgpy5nlx6dlfcb8s00x7";
name = "kwin-5.8.5.tar.xz";
};
};
kwrited = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/kwrited-5.8.5.tar.xz";
sha256 = "1nsr244niyq2bk29s0cqq1p2qj0h1hx4nl13nc3x3aycfhfkjfkr";
name = "kwrited-5.8.5.tar.xz";
};
};
libkscreen = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/libkscreen-5.8.5.tar.xz";
sha256 = "1zj2nzyl0nmg5za3iwr4q4nzfv69f35f0394b6k0g3dgh1zxmby9";
name = "libkscreen-5.8.5.tar.xz";
};
};
libksysguard = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/libksysguard-5.8.5.tar.xz";
sha256 = "1acp4kzdjhipsqw90n3rc1ydbkqhb12afwdsfl25fibv0c39avwp";
name = "libksysguard-5.8.5.tar.xz";
};
};
milou = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/milou-5.8.5.tar.xz";
sha256 = "0lj5cb43jkqs8qg2acs39dkfwskbw135ap65vxiv27ivxscyvz3d";
name = "milou-5.8.5.tar.xz";
};
};
oxygen = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/oxygen-5.8.5.tar.xz";
sha256 = "199jcn6qzyihxmw38b1cl0ah0rzn7f574khx72n9x5y9143p9lh7";
name = "oxygen-5.8.5.tar.xz";
};
};
plasma-desktop = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/plasma-desktop-5.8.5.tar.xz";
sha256 = "045990fvhqpwhfi6jqpkzhgbhc3lwvwhkia1y77m12n1djbynpnr";
name = "plasma-desktop-5.8.5.tar.xz";
};
};
plasma-integration = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/plasma-integration-5.8.5.tar.xz";
sha256 = "1sm7027ywz8xxqfsjv6jvk8zx11kx83rx88bb8cy31qfjipsakfb";
name = "plasma-integration-5.8.5.tar.xz";
};
};
plasma-nm = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/plasma-nm-5.8.5.tar.xz";
sha256 = "1g1yyzc8y2hsgycficvavpl5yizd54ns93cdky9cgsrnxlkfwbvc";
name = "plasma-nm-5.8.5.tar.xz";
};
};
plasma-pa = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/plasma-pa-5.8.5.tar.xz";
sha256 = "0vg1dyxfg8rxzyh0xnk41c95zp8rdbx1w462llrwchzp29p3xg1b";
name = "plasma-pa-5.8.5.tar.xz";
};
};
plasma-sdk = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/plasma-sdk-5.8.5.tar.xz";
sha256 = "13lyb5x4a8aq4fykvdv1137yvc4s4q31fdxhxppza1wkw8lvbvpd";
name = "plasma-sdk-5.8.5.tar.xz";
};
};
plasma-tests = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/plasma-tests-5.8.5.tar.xz";
sha256 = "0wgqyqlqygi3z0cccpfrpi259jp4yhh2g4x3mqcxisv58mbjrj1b";
name = "plasma-tests-5.8.5.tar.xz";
};
};
plasma-workspace = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-5.8.5.tar.xz";
sha256 = "18bf5wmyb198jnbpivjjwsk65sksrvzlvykx3mr3wvj30mr0f9bd";
name = "plasma-workspace-5.8.5.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-wallpapers-5.8.5.tar.xz";
sha256 = "116s9qw888lbgxc9ggxf7fa99vggixr2ig1715xb5zmqm14yznyz";
name = "plasma-workspace-wallpapers-5.8.5.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/polkit-kde-agent-1-5.8.5.tar.xz";
sha256 = "1dwk848wljcd9bi0h58h0ljnjlz1qq50rd7i38f3cb848iipisw7";
name = "polkit-kde-agent-1-5.8.5.tar.xz";
};
};
powerdevil = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/powerdevil-5.8.5.tar.xz";
sha256 = "0lj7jcaqfsipiwi7x4q684p4pfsqzflvddr7hrhirfl1p62bc704";
name = "powerdevil-5.8.5.tar.xz";
};
};
sddm-kcm = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/sddm-kcm-5.8.5.tar.xz";
sha256 = "0dcvk3f3cqq4z5hc63ccpxyl3kknjvd8jsnx7r2hfrwsw0y90fqc";
name = "sddm-kcm-5.8.5.tar.xz";
};
};
systemsettings = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/systemsettings-5.8.5.tar.xz";
sha256 = "0pkwmgbjglbyc8i22hivh5gnaj742df3ff3f998k66k81mfjkwga";
name = "systemsettings-5.8.5.tar.xz";
};
};
user-manager = {
version = "5.8.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.8.5/user-manager-5.8.5.tar.xz";
sha256 = "1ck8x860q3aqgbbgiwfdhs0i0bs2nhqqva19kl9x1b015p64gl5z";
name = "user-manager-5.8.5.tar.xz";
};
};
}

18
pkgs/desktops/lumina/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx,
numlockx, xorg, qt5, kde5 xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmakeHook, qttools, oxygen-icons5
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,19 +14,19 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
qt5.qmakeHook qmakeHook
qt5.qttools qttools
]; ];
buildInputs = [ buildInputs = [
xorg.libxcb xorg.libxcb
xorg.xcbutilwm xorg.xcbutilwm
xorg.xcbutilimage xorg.xcbutilimage
qt5.qtbase qtbase
qt5.qtsvg qtsvg
qt5.qtmultimedia qtmultimedia
qt5.qtx11extras qtx11extras
kde5.oxygen-icons5 oxygen-icons5
fluxbox fluxbox
xscreensaver xscreensaver
desktop_file_utils desktop_file_utils

15
pkgs/desktops/lxqt/base/liblxqt/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools,
qtx11extras, qttools, qtsvg, libqtxdg, kwindowsystem, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -14,15 +15,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtx11extras qtx11extras
qt5.qttools qttools
qt5.qtsvg qtsvg
kde5.kwindowsystem kwindowsystem
lxqt.libqtxdg libqtxdg
xorg.libXScrnSaver xorg.libXScrnSaver
]; ];

13
pkgs/desktops/lxqt/core/libfm-qt/default.nix
View File

@ -1,5 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, {
libfm, menu-cache }: stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
xorg, libfm, menu-cache,
qtx11extras, qttools
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -16,12 +19,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtx11extras qtx11extras
qt5.qttools qttools
libfm libfm
menu-cache menu-cache
]; ];

18
pkgs/desktops/lxqt/core/lxqt-about/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -14,21 +14,21 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtx11extras qtx11extras
qt5.qttools qttools
qt5.qtsvg qtsvg
kde5.kwindowsystem kwindowsystem
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch; postPatch = standardPatch;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Dialogue window providing information about LXQt and the system it's running on"; description = "Dialogue window providing information about LXQt and the system it's running on";

18
pkgs/desktops/lxqt/core/lxqt-admin/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, polkit }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -14,22 +14,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtx11extras qtx11extras
qt5.qttools qttools
qt5.qtsvg qtsvg
kde5.kwindowsystem kwindowsystem
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
polkit polkit
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch; postPatch = standardPatch;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "LXQt system administration tool"; description = "LXQt system administration tool";

22
pkgs/desktops/lxqt/core/lxqt-config/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }: { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -15,18 +15,18 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qtx11extras qtx11extras
qt5.qttools qttools
qt5.qtsvg qtsvg
kde5.kwindowsystem kwindowsystem
kde5.libkscreen libkscreen
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
xorg.libpthreadstubs xorg.libpthreadstubs
xorg.libXdmcp xorg.libXdmcp
xorg.libXScrnSaver xorg.libXScrnSaver
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch; postPatch = standardPatch;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tools to configure LXQt and the underlying operating system"; description = "Tools to configure LXQt and the underlying operating system";

20
pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -14,22 +14,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtx11extras qtx11extras
qt5.qtsvg qtsvg
kde5.kwindowsystem kwindowsystem
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch; postPatch = standardPatch;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Daemon used to register global keyboard shortcuts"; description = "Daemon used to register global keyboard shortcuts";

18
pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtsvg qtsvg
kde5.kwindowsystem kwindowsystem
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
lxqt.lxqt-common lxqt-common
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

18
pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtx11extras qtx11extras
qt5.qtsvg qtsvg
kde5.kwindowsystem kwindowsystem
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

41
pkgs/desktops/lxqt/core/lxqt-panel/default.nix
View File

@ -1,6 +1,11 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, {
libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, stdenv, fetchFromGitHub, standardPatch,
lxmenu-data }: cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat,
xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
lxmenu-data
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -17,23 +22,23 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtx11extras qtx11extras
qt5.qtsvg qtsvg
qt5.libdbusmenu libdbusmenu
kde5.kwindowsystem kwindowsystem
kde5.solid solid
kde5.kguiaddons kguiaddons
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
lxqt.lxqt-common lxqt-common
lxqt.lxqt-globalkeys lxqt-globalkeys
lxqt.libsysstat libsysstat
xorg.libpthreadstubs xorg.libpthreadstubs
xorg.libXdmcp xorg.libXdmcp
libstatgrab libstatgrab
@ -46,7 +51,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch; postPatch = standardPatch;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The LXQt desktop panel"; description = "The LXQt desktop panel";

24
pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
View File

@ -1,4 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt }: {
stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt,
libqtxdg,
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -15,18 +19,18 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtx11extras qtx11extras
qt5.qtsvg qtsvg
qt5.polkit-qt polkit-qt
kde5.kwindowsystem kwindowsystem
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

22
pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -14,19 +14,19 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtx11extras qtx11extras
qt5.qtsvg qtsvg
kde5.kwindowsystem kwindowsystem
kde5.solid solid
kde5.kidletime kidletime
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

22
pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
View File

@ -1,4 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: {
stdenv, fetchFromGitHub, standardPatch,
cmake, lxqt-build-tools,
qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg,
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -14,21 +18,21 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qtx11extras qtx11extras
qt5.qttools qttools
qt5.qtsvg qtsvg
qt5.libdbusmenu libdbusmenu
lxqt.libqtxdg libqtxdg
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch; postPatch = standardPatch;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "LXQt Qt platform integration plugin"; description = "LXQt Qt platform integration plugin";

20
pkgs/desktops/lxqt/core/lxqt-runner/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys,
menu-cache, muparser }: menu-cache, muparser }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,18 +16,18 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtsvg qtsvg
kde5.kwindowsystem kwindowsystem
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
lxqt.lxqt-common lxqt-common
lxqt.lxqt-globalkeys lxqt-globalkeys
menu-cache menu-cache
muparser muparser
]; ];

18
pkgs/desktops/lxqt/core/lxqt-session/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, xdg-user-dirs }: { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -15,17 +15,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtsvg qtsvg
kde5.kwindowsystem kwindowsystem
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
lxqt.lxqt-common lxqt-common
xorg.libpthreadstubs xorg.libpthreadstubs
xorg.libXdmcp xorg.libXdmcp
xdg-user-dirs xdg-user-dirs

18
pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, sudo }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtx11extras qtx11extras
qt5.qtsvg qtsvg
kde5.kwindowsystem kwindowsystem
lxqt.liblxqt liblxqt
lxqt.libqtxdg libqtxdg
sudo sudo
]; ];

18
pkgs/desktops/lxqt/default.nix
View File

@ -1,9 +1,7 @@
{ pkgs, newScope, fetchFromGitHub }: { pkgs, makeScope, libsForQt5, fetchFromGitHub }:
let let
callPackage = newScope self; packages = self: with self; {
self = rec {
# For compiling information, see: # For compiling information, see:
# - https://github.com/lxde/lxqt/wiki/Building-from-source # - https://github.com/lxde/lxqt/wiki/Building-from-source
@ -57,7 +55,7 @@ let
### OPTIONAL ### OPTIONAL
qterminal = callPackage ./optional/qterminal { }; qterminal = callPackage ./optional/qterminal { };
compton-conf = callPackage ./optional/compton-conf { }; compton-conf = pkgs.qt5.callPackage ./optional/compton-conf { };
obconf-qt = callPackage ./optional/obconf-qt { }; obconf-qt = callPackage ./optional/obconf-qt { };
lximage-qt = callPackage ./optional/lximage-qt { }; lximage-qt = callPackage ./optional/lximage-qt { };
qps = callPackage ./optional/qps { }; qps = callPackage ./optional/qps { };
@ -66,14 +64,14 @@ let
preRequisitePackages = [ preRequisitePackages = [
pkgs.gvfs # virtual file systems support for PCManFM-QT pkgs.gvfs # virtual file systems support for PCManFM-QT
pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel pkgs.libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
pkgs.kde5.libkscreen # provides plugins for screen management software pkgs.libsForQt5.libkscreen # provides plugins for screen management software
pkgs.libfm pkgs.libfm
pkgs.libfm-extra pkgs.libfm-extra
pkgs.lxmenu-data pkgs.lxmenu-data
pkgs.menu-cache pkgs.menu-cache
pkgs.openbox # default window manager pkgs.openbox # default window manager
pkgs.qt5.qtsvg # provides QT5 plugins for svg icons qt5.qtsvg # provides QT5 plugins for svg icons
]; ];
corePackages = [ corePackages = [
@ -120,7 +118,7 @@ let
qlipper qlipper
### Default icon theme ### Default icon theme
pkgs.kde5.oxygen-icons5 pkgs.oxygen-icons5
### Screen saver ### Screen saver
pkgs.xscreensaver pkgs.xscreensaver
@ -128,4 +126,4 @@ let
}; };
in self in makeScope libsForQt5.newScope packages

Some files were not shown because too many files have changed in this diff Show More