From eaa644a5af59b1967fb464a61316a1004cb5e888 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 15 May 2017 11:44:58 -0500 Subject: [PATCH] plasma5: rename plasmaPackage to mkDerivation --- pkgs/desktops/plasma-5/bluedevil.nix | 4 +-- pkgs/desktops/plasma-5/breeze-grub.nix | 4 +-- pkgs/desktops/plasma-5/breeze-gtk.nix | 7 ++--- .../plasma-5/breeze-plymouth/default.nix | 4 +-- pkgs/desktops/plasma-5/breeze-qt4.nix | 4 +-- pkgs/desktops/plasma-5/breeze-qt5.nix | 4 +-- .../plasma-5/build-support/package.nix | 27 ---------------- pkgs/desktops/plasma-5/default.nix | 31 ++++++++++++++++--- pkgs/desktops/plasma-5/kactivitymanagerd.nix | 4 +-- pkgs/desktops/plasma-5/kde-cli-tools.nix | 4 +-- .../plasma-5/kde-gtk-config/default.nix | 4 +-- pkgs/desktops/plasma-5/kdecoration.nix | 4 +-- pkgs/desktops/plasma-5/kdeplasma-addons.nix | 9 ++---- pkgs/desktops/plasma-5/kgamma5.nix | 4 +-- pkgs/desktops/plasma-5/khotkeys.nix | 4 +-- pkgs/desktops/plasma-5/kinfocenter.nix | 4 +-- pkgs/desktops/plasma-5/kmenuedit.nix | 4 +-- pkgs/desktops/plasma-5/kscreen.nix | 4 +-- pkgs/desktops/plasma-5/kscreenlocker.nix | 4 +-- pkgs/desktops/plasma-5/ksshaskpass.nix | 4 +-- pkgs/desktops/plasma-5/ksysguard.nix | 4 +-- pkgs/desktops/plasma-5/kwallet-pam.nix | 5 ++- .../plasma-5/kwayland-integration.nix | 17 +++------- pkgs/desktops/plasma-5/kwin/default.nix | 4 +-- pkgs/desktops/plasma-5/kwrited.nix | 4 +-- pkgs/desktops/plasma-5/libkscreen/default.nix | 12 +++---- .../plasma-5/libksysguard/default.nix | 4 +-- pkgs/desktops/plasma-5/milou.nix | 4 +-- pkgs/desktops/plasma-5/oxygen.nix | 4 +-- .../plasma-5/plasma-desktop/default.nix | 4 +-- pkgs/desktops/plasma-5/plasma-integration.nix | 4 +-- pkgs/desktops/plasma-5/plasma-nm/default.nix | 5 ++- pkgs/desktops/plasma-5/plasma-pa.nix | 8 ++--- .../plasma-5/plasma-workspace-wallpapers.nix | 4 +-- .../plasma-5/plasma-workspace/default.nix | 4 +-- pkgs/desktops/plasma-5/polkit-kde-agent.nix | 4 +-- pkgs/desktops/plasma-5/powerdevil.nix | 4 +-- pkgs/desktops/plasma-5/systemsettings.nix | 6 ++-- 38 files changed, 106 insertions(+), 133 deletions(-) delete mode 100644 pkgs/desktops/plasma-5/build-support/package.nix diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index d0e784998132..6db3e7879115 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,10 +1,10 @@ { - plasmaPackage, extra-cmake-modules, shared_mime_info, + mkDerivation, extra-cmake-modules, shared_mime_info, bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative }: -plasmaPackage { +mkDerivation { name = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix index da0fb6f73ad7..e8ac5c1e208f 100644 --- a/pkgs/desktops/plasma-5/breeze-grub.nix +++ b/pkgs/desktops/plasma-5/breeze-grub.nix @@ -1,8 +1,8 @@ { - plasmaPackage + mkDerivation }: -plasmaPackage { +mkDerivation { name = "breeze-grub"; outputs = [ "out" ]; installPhase = '' diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix index 4048d98431db..9c204e3acb89 100644 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -1,9 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, qtbase -}: +{ mkDerivation , extra-cmake-modules , qtbase }: -plasmaPackage { +mkDerivation { name = "breeze-gtk"; nativeBuildInputs = [ extra-cmake-modules ]; cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ]; diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index dfbdf48165aa..898d9cd78a58 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -1,10 +1,10 @@ { - plasmaPackage, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, plymouth }: -plasmaPackage { +mkDerivation { name = "breeze-plymouth"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plymouth ]; diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix index adcc6110c4d7..6c9d0c5c4ce8 100644 --- a/pkgs/desktops/plasma-5/breeze-qt4.nix +++ b/pkgs/desktops/plasma-5/breeze-qt4.nix @@ -1,10 +1,10 @@ { - plasmaPackage, lib, + mkDerivation, lib, automoc4, cmake, perl, pkgconfig, kdelibs4, qt4, xproto }: -plasmaPackage { +mkDerivation { name = "breeze-qt4"; sname = "breeze"; buildInputs = [ kdelibs4 qt4 xproto ]; diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index a1b64a4656cb..11af6fff04b9 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -1,11 +1,11 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras }: -plasmaPackage { +mkDerivation { name = "breeze-qt5"; sname = "breeze"; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/build-support/package.nix b/pkgs/desktops/plasma-5/build-support/package.nix deleted file mode 100644 index 64c7934cc235..000000000000 --- a/pkgs/desktops/plasma-5/build-support/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ mkDerivation, lib, fetchurl }: - -let - mirror = "mirror://kde"; - srcs = import ../srcs.nix { inherit fetchurl mirror; }; -in - -args: - -let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; -in -mkDerivation (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 {}); -}) diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 83d7d39dd866..10d5a152f130 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -31,13 +31,36 @@ existing packages here and modify it as necessary. }: let + srcs = import ./srcs.nix { + inherit fetchurl; + mirror = "mirror://kde"; + }; + packages = self: with self; let callPackage = self.newScope { - plasmaPackage = import ./build-support/package.nix { - inherit lib fetchurl; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; - }; + mkDerivation = args: + let + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; + mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + in + mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + outputs = args.outputs or [ "out" "dev" ]; + + 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 {}); + }); }; in { bluedevil = callPackage ./bluedevil.nix {}; diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index 282e58ecf9e6..27f977ea7854 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -1,10 +1,10 @@ -{ plasmaPackage +{ mkDerivation , extra-cmake-modules , boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel , kwindowsystem, kxmlgui }: -plasmaPackage { +mkDerivation { name = "kactivitymanagerd"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index 87a46703997a..e18481d6da93 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -1,10 +1,10 @@ { - plasmaPackage, extra-cmake-modules, + mkDerivation, extra-cmake-modules, kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes, kwindowsystem, qtsvg, qtx11extras }: -plasmaPackage { +mkDerivation { name = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index f482f2a6a3f3..eaa2a906f823 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -1,4 +1,4 @@ -{ plasmaPackage +{ mkDerivation , extra-cmake-modules , glib , gtk2 @@ -12,7 +12,7 @@ , knewstuff }: -plasmaPackage { +mkDerivation { name = "kde-gtk-config"; patches = [ ./0001-follow-symlinks.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index 546f72c3f384..9efdb8cff815 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -1,6 +1,6 @@ -{ plasmaPackage, extra-cmake-modules, qtbase }: +{ mkDerivation, extra-cmake-modules, qtbase }: -plasmaPackage { +mkDerivation { name = "kdecoration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index 3371e17beaf8..e3526d56c376 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -1,16 +1,13 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools +{ mkDerivation, extra-cmake-modules, kdoctools , kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n , kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras , ibus }: -plasmaPackage { +mkDerivation { name = "kdeplasma-addons"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff kross krunner kservice ksysguard kunitconversion plasma-framework diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index 965c33e6eef8..8199b5d03305 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,8 +1,8 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support +{ mkDerivation, extra-cmake-modules, kdoctools, kdelibs4support , qtx11extras }: -plasmaPackage { +mkDerivation { name = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kdelibs4support qtx11extras ]; diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index 2b02e5916b9f..32d9c14ddefc 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -1,10 +1,10 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils +{ mkDerivation, extra-cmake-modules, kdoctools, kcmutils , kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui , plasma-framework, plasma-workspace, qtx11extras , fetchpatch }: -plasmaPackage { +mkDerivation { name = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index b4c8dc99adcb..ee6aa6aebdac 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -1,12 +1,12 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid }: -plasmaPackage { +mkDerivation { name = "kinfocenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix index a27dc5dd92a8..164c378a60d5 100644 --- a/pkgs/desktops/plasma-5/kmenuedit.nix +++ b/pkgs/desktops/plasma-5/kmenuedit.nix @@ -1,11 +1,11 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, kdoctools, kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui, sonnet }: -plasmaPackage { +mkDerivation { name = "kmenuedit"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index e0fbea5d7467..93dd0e710508 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -1,9 +1,9 @@ -{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets +{ mkDerivation, extra-cmake-modules, kconfig, kconfigwidgets , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui , libkscreen, qtdeclarative, qtgraphicaleffects }: -plasmaPackage { +mkDerivation { name = "kscreen"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index 3551feab76fc..64ea46905138 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -1,11 +1,11 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime, kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland }: -plasmaPackage { +mkDerivation { name = "kscreenlocker"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index f1a6b82ae93c..94bc5a35da03 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -1,8 +1,8 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons +{ mkDerivation, extra-cmake-modules, kdoctools, kcoreaddons , ki18n, kwallet, kwidgetsaddons }: -plasmaPackage { +mkDerivation { name = "ksshaskpass"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ]; diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix index 366b154cae70..63aeda685ba6 100644 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ b/pkgs/desktops/plasma-5/ksysguard.nix @@ -1,12 +1,12 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, kdoctools, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, knewstuff, libksysguard, qtwebkit }: -plasmaPackage { +mkDerivation { name = "ksysguard"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ lm_sensors ]; diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index 2789499c50a2..b7a783f82a34 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -1,7 +1,6 @@ -{ plasmaPackage, extra-cmake-modules, pam, socat, libgcrypt -}: +{ mkDerivation, extra-cmake-modules, pam, socat, libgcrypt }: -plasmaPackage { +mkDerivation { name = "kwallet-pam"; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 9045227a51a9..e5d00eb0800e 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -1,16 +1,7 @@ -{ plasmaPackage -, extra-cmake-modules -, kidletime -, kwayland -, kwindowsystem -}: +{ mkDerivation , extra-cmake-modules , kidletime , kwayland , kwindowsystem }: -plasmaPackage { +mkDerivation { name = "kwayland-integration"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - propagatedBuildInputs = [ - kidletime kwindowsystem kwayland - ]; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ kidletime kwindowsystem kwayland ]; } diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index a14b6433a76e..ab8cc4d2498d 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,5 @@ { - plasmaPackage, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, @@ -10,7 +10,7 @@ xcb-util-cursor, xwayland }: -plasmaPackage { +mkDerivation { name = "kwin"; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index 29498e93404d..18c4a4af8dbc 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -1,8 +1,8 @@ -{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty +{ mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, kpty , knotifications, kdbusaddons }: -plasmaPackage { +mkDerivation { name = "kwrited"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ]; diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index 6881f95e6d58..82a254c3a379 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -1,17 +1,13 @@ -{ plasmaPackage, lib, copyPathsToStore +{ mkDerivation, lib, copyPathsToStore , extra-cmake-modules , kwayland, libXrandr , qtx11extras }: -plasmaPackage { +mkDerivation { name = "libkscreen"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - propagatedBuildInputs = [ - kwayland libXrandr qtx11extras - ]; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ kwayland libXrandr qtx11extras ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/$qtPluginPrefix/kf5/kscreen\"" diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index b67e041a7821..e7cdf28a728d 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -1,12 +1,12 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras }: -plasmaPackage { +mkDerivation { name = "libksysguard"; patches = [ ./0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index 43f78d9e2a97..abc35279aba5 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -1,9 +1,9 @@ -{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative +{ mkDerivation, extra-cmake-modules, qtscript, qtdeclarative , kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework , krunner }: -plasmaPackage { +mkDerivation { name = "milou"; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index b4ff775264f8..c50fd8b05140 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -1,12 +1,12 @@ { - plasmaPackage, kdeWrapper, + mkDerivation, kdeWrapper, extra-cmake-modules, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras }: let - unwrapped = plasmaPackage { + unwrapped = mkDerivation { name = "oxygen"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 1c152500b6a0..a1ccaea6ea31 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,5 +1,5 @@ { - plasmaPackage, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, @@ -12,7 +12,7 @@ utillinux }: -plasmaPackage rec { +mkDerivation rec { name = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix index 97d30dcd7732..2bca3943c349 100644 --- a/pkgs/desktops/plasma-5/plasma-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-integration.nix @@ -1,11 +1,11 @@ -{ plasmaPackage, extra-cmake-modules +{ mkDerivation, extra-cmake-modules , breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland , libXcursor }: # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration -plasmaPackage { +mkDerivation { name = "plasma-integration"; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 736d59b40412..5c343548fcfb 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools +{ mkDerivation, substituteAll, extra-cmake-modules, kdoctools , kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem @@ -7,7 +7,7 @@ , qca-qt5, qtdeclarative, solid, openvpn }: -plasmaPackage { +mkDerivation { name = "plasma-nm"; patches = [ (substituteAll { @@ -27,5 +27,4 @@ plasmaPackage { mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect qca-qt5 solid ]; - enableParallelBuilding = true; } diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index f398e1a9efc0..ec40ffb96308 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,15 +1,13 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework }: -plasmaPackage { +mkDerivation { name = "plasma-pa"; - nativeBuildInputs = [ - extra-cmake-modules kdoctools - ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix index 8af9caaa5795..fb0830eb59a7 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix @@ -1,8 +1,8 @@ -{ plasmaPackage +{ mkDerivation , extra-cmake-modules }: -plasmaPackage { +mkDerivation { name = "plasma-workspace-wallpapers"; outputs = [ "out" ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 8759c7d8c1e7..175a80fcb4c3 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -1,5 +1,5 @@ { - plasmaPackage, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, @@ -12,7 +12,7 @@ libXcursor, pam, wayland }: -plasmaPackage { +mkDerivation { name = "plasma-workspace"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 1d7d20a7ffbf..bd3e5d6e1f4b 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -1,10 +1,10 @@ { - plasmaPackage, extra-cmake-modules, + mkDerivation, extra-cmake-modules, kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications, kwidgetsaddons, kwindowsystem, polkit-qt }: -plasmaPackage { +mkDerivation { name = "polkit-kde-agent"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index c3469cc2ebc8..4660efd66aba 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,10 +1,10 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, bluez-qt, kactivities +{ mkDerivation, extra-cmake-modules, kdoctools, bluez-qt, kactivities , kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n , kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt , plasma-workspace, qtx11extras, solid, udev }: -plasmaPackage { +mkDerivation { name = "powerdevil"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 4146e34c2f73..5ada154f77d4 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -1,12 +1,12 @@ { - plasmaPackage, extra-cmake-modules, kdoctools, makeQtWrapper, + mkDerivation, extra-cmake-modules, kdoctools, makeQtWrapper, kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2 }: -plasmaPackage { +mkDerivation { name = "systemsettings"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2