diff options
author | K900 <me@0upti.me> | 2022-10-07 13:39:27 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2022-10-12 17:15:56 +0300 |
commit | 13961bf28e4e33bde5c7a365ec62bc5f182e9bf9 (patch) | |
tree | 750e39863ebcd4947c30238684b799457822d8fe /pkgs | |
parent | 5e62c78f4b565f98b798046c9285f5c0d663695f (diff) |
pkgs/desktops/plasma-5: nixpkgs-fmt the whole thing
Diffstat (limited to 'pkgs')
55 files changed, 1521 insertions, 551 deletions
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix index 66e1255f223a6..1a18e1a89de16 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix @@ -1,5 +1,10 @@ -{ lib, mkDerivation, fetchFromGitHub, extra-cmake-modules -, kwindowsystem, plasma-framework }: +{ lib +, mkDerivation +, fetchFromGitHub +, extra-cmake-modules +, kwindowsystem +, plasma-framework +}: mkDerivation rec { pname = "plasma-applet-caffeine-plus"; @@ -13,7 +18,8 @@ mkDerivation rec { }; buildInputs = [ - kwindowsystem plasma-framework + kwindowsystem + plasma-framework ]; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix index 5255bb4b0501a..3ac49717390e7 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix @@ -1,6 +1,13 @@ -{ lib, stdenv -, cmake, fetchFromGitHub, extra-cmake-modules -, qtbase, wrapQtAppsHook, ki18n, kdelibs4support, krunner +{ lib +, stdenv +, cmake +, fetchFromGitHub +, extra-cmake-modules +, qtbase +, wrapQtAppsHook +, ki18n +, kdelibs4support +, krunner }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix index e71a0bd0230c7..5e4ac584047cf 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix @@ -19,7 +19,9 @@ mkDerivation rec { }; buildInputs = [ - kwindowsystem plasma-framework qtx11extras + kwindowsystem + plasma-framework + qtx11extras ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix index 043f52c37efcf..2e9864cb1da3a 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "dynamic_workspaces"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix index 23802bef97bdb..b6025c5bdf107 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "krohnkite"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix index a56ebf1579b1d..ce0556ee1a770 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "kzones"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix index 5de935b9ec237..8d38583e1d511 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "parachute"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix index 8a455cb88826d..5f13a95ce081c 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "kwin-tiling"; @@ -18,7 +24,10 @@ mkDerivation rec { ''; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix index 39be6c63f1e33..c4ae4d75d2010 100644 --- a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix +++ b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix @@ -22,7 +22,7 @@ mkDerivation rec{ sha256 = "k1fEZbhzluNlAmj5s/O9X20aCVQxlWQm/Iw/euX7cmI="; }; - extraCmakeFlags=["-DBUILD_TESTING=OFF"]; + extraCmakeFlags = [ "-DBUILD_TESTING=OFF" ]; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/aura-browser.nix b/pkgs/desktops/plasma-5/aura-browser.nix index b012417a6bc75..67af48b2bcb95 100644 --- a/pkgs/desktops/plasma-5/aura-browser.nix +++ b/pkgs/desktops/plasma-5/aura-browser.nix @@ -1,10 +1,9 @@ -{ - mkDerivation, - extra-cmake-modules, - qtwebengine, - qtquickcontrols2, - kirigami2, - ki18n, +{ mkDerivation +, extra-cmake-modules +, qtwebengine +, qtquickcontrols2 +, kirigami2 +, ki18n }: mkDerivation { pname = "aura-browser"; diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index 389746f17af9a..ab7ceea4b1171 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,16 +1,40 @@ -{ - mkDerivation, lib, extra-cmake-modules, shared-mime-info, - qtbase, qtdeclarative, bluez-qt, - kcoreaddons, kcmutils, kdbusaddons, kded, ki18n, kiconthemes, kio, - knotifications, kwidgetsaddons, kwindowsystem, plasma-framework +{ mkDerivation +, lib +, extra-cmake-modules +, shared-mime-info +, qtbase +, qtdeclarative +, bluez-qt +, kcoreaddons +, kcmutils +, kdbusaddons +, kded +, ki18n +, kiconthemes +, kio +, knotifications +, kwidgetsaddons +, kwindowsystem +, plasma-framework }: mkDerivation { pname = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ - qtbase qtdeclarative bluez-qt - ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded - kiconthemes knotifications kwidgetsaddons kcmutils + qtbase + qtdeclarative + bluez-qt + ki18n + kio + kwindowsystem + plasma-framework + kcoreaddons + kdbusaddons + kded + kiconthemes + knotifications + kwidgetsaddons + kcmutils ]; } diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix index 24d0c96cad97a..86ce3dc112d05 100644 --- a/pkgs/desktops/plasma-5/breeze-grub.nix +++ b/pkgs/desktops/plasma-5/breeze-grub.nix @@ -1,5 +1,4 @@ -{ - mkDerivation +{ mkDerivation }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index bc60662b434ac..b8188fece80bb 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -1,26 +1,25 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - plymouth, - nixos-icons, - imagemagick, - netpbm, - perl, - logoName ? null, - logoFile ? null, - osName ? null, - osVersion ? null, - topColor ? "black", - bottomColor ? "black" +{ mkDerivation +, lib +, extra-cmake-modules +, plymouth +, nixos-icons +, imagemagick +, netpbm +, perl +, logoName ? null +, logoFile ? null +, osName ? null +, osVersion ? null +, topColor ? "black" +, bottomColor ? "black" }: let validColors = [ "black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green" ]; - resolvedLogoName = if (logoFile != null && logoName == null) then lib.strings.removeSuffix ".png" (baseNameOf(toString logoFile)) else logoName; + resolvedLogoName = if (logoFile != null && logoName == null) then lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) else logoName; in - assert lib.asserts.assertOneOf "topColor" topColor validColors; - assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; +assert lib.asserts.assertOneOf "topColor" topColor validColors; +assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; mkDerivation { @@ -30,21 +29,21 @@ mkDerivation { patches = [ ./install-paths.patch ]; - cmakeFlags = [] - ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" - ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" - ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" - ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" + cmakeFlags = [ ] + ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" + ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" + ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" + ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}" ; postPatch = '' - substituteInPlace cmake/FindPlymouth.cmake --subst-var out + substituteInPlace cmake/FindPlymouth.cmake --subst-var out '' + lib.optionalString (logoFile != null) '' - cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png + cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png - # conversion for 16bit taken from the breeze-plymouth readme - convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png - pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png + # conversion for 16bit taken from the breeze-plymouth readme + convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png + pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png ''; } diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index 13a426bb25874..bcabd31eea644 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -1,9 +1,18 @@ -{ - mkDerivation, - extra-cmake-modules, - frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, - kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative, - qtx11extras, fftw +{ mkDerivation +, extra-cmake-modules +, frameworkintegration +, kcmutils +, kconfigwidgets +, kcoreaddons +, kdecoration +, kguiaddons +, ki18n +, kwayland +, kwindowsystem +, plasma-framework +, qtdeclarative +, qtx11extras +, fftw }: mkDerivation { @@ -11,9 +20,19 @@ mkDerivation { sname = "breeze"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ - frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration - kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative - qtx11extras fftw + frameworkintegration + kcmutils + kconfigwidgets + kcoreaddons + kdecoration + kguiaddons + ki18n + kwayland + kwindowsystem + plasma-framework + qtdeclarative + qtx11extras + fftw ]; outputs = [ "bin" "dev" "out" ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 581bd25027fd6..bb3119ed6d458 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -1,31 +1,35 @@ /* -# New packages + # New packages -READ THIS FIRST + 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). + 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. + 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. + 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 + # Updates -1. Update the URL in `./fetch.sh`. -2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5` + 1. Update the URL in `./fetch.sh`. + 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5` 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. + 3. Use `nox-review wip` to check that everything builds. + 4. Commit the changes and open a pull request. */ -{ libsForQt5, lib, config, fetchurl -, gconf, gsettings-desktop-schemas +{ libsForQt5 +, lib +, config +, fetchurl +, gconf +, gsettings-desktop-schemas }: let @@ -33,7 +37,13 @@ let broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + lgpl21Plus + lgpl3Plus + bsd2 + mit + gpl2Plus + gpl3Plus + fdl12 ]; srcs = import ./srcs.nix { @@ -41,33 +51,35 @@ let mirror = "mirror://kde"; }; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { }; packages = self: with self; let propagate = out: - let setupHook = { writeScript }: - writeScript "setup-hook" '' - if [[ "''${hookName-}" != postHook ]]; then - postHooks+=("source @dev@/nix-support/setup-hook") - else - # Propagate $${out} output - propagatedUserEnvPkgs+=" @${out}@" - - if [ -z "$outputDev" ]; then - echo "error: \$outputDev is unset!" >&2 - exit 1 - fi - - # Propagate $dev so that this setup hook is propagated - # But only if there is a separate $dev output - if [ "$outputDev" != out ]; then - propagatedBuildInputs+=" @dev@" - fi - fi - ''; - in callPackage setupHook {}; + let + setupHook = { writeScript }: + writeScript "setup-hook" '' + if [[ "''${hookName-}" != postHook ]]; then + postHooks+=("source @dev@/nix-support/setup-hook") + else + # Propagate $${out} output + propagatedUserEnvPkgs+=" @${out}@" + + if [ -z "$outputDev" ]; then + echo "error: \$outputDev is unset!" >&2 + exit 1 + fi + + # Propagate $dev so that this setup hook is propagated + # But only if there is a separate $dev output + if [ "$outputDev" != out ]; then + propagatedBuildInputs+=" @dev@" + fi + fi + ''; + in + callPackage setupHook { }; propagateBin = propagate "bin"; @@ -88,11 +100,11 @@ let setupHook = args.setupHook or defaultSetupHook; meta = - let meta = args.meta or {}; in + let meta = args.meta or { }; in meta // { homepage = meta.homepage or "http://www.kde.org"; license = meta.license or license; - maintainers = (meta.maintainers or []) ++ maintainers; + maintainers = (meta.maintainers or [ ]) ++ maintainers; platforms = meta.platforms or lib.platforms.linux; broken = meta.broken or broken; }; @@ -102,61 +114,62 @@ let }); }; - in { - aura-browser = callPackage ./aura-browser.nix {}; - bluedevil = callPackage ./bluedevil.nix {}; - breeze-gtk = callPackage ./breeze-gtk.nix {}; - breeze-qt5 = callPackage ./breeze-qt5.nix {}; - breeze-grub = callPackage ./breeze-grub.nix {}; - breeze-plymouth = callPackage ./breeze-plymouth {}; - discover = callPackage ./discover.nix {}; - kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; - kde-cli-tools = callPackage ./kde-cli-tools.nix {}; + in + { + aura-browser = callPackage ./aura-browser.nix { }; + bluedevil = callPackage ./bluedevil.nix { }; + breeze-gtk = callPackage ./breeze-gtk.nix { }; + breeze-qt5 = callPackage ./breeze-qt5.nix { }; + breeze-grub = callPackage ./breeze-grub.nix { }; + breeze-plymouth = callPackage ./breeze-plymouth { }; + discover = callPackage ./discover.nix { }; + kactivitymanagerd = callPackage ./kactivitymanagerd.nix { }; + kde-cli-tools = callPackage ./kde-cli-tools.nix { }; kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; }; - 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 {}; - kpipewire = callPackage ./kpipewire.nix {}; - kscreen = callPackage ./kscreen.nix {}; - kscreenlocker = callPackage ./kscreenlocker.nix {}; - ksshaskpass = callPackage ./ksshaskpass.nix {}; - ksystemstats = callPackage ./ksystemstats.nix {}; - kwallet-pam = callPackage ./kwallet-pam.nix {}; - kwayland-integration = callPackage ./kwayland-integration.nix {}; - kwin = callPackage ./kwin {}; - kwrited = callPackage ./kwrited.nix {}; - layer-shell-qt = callPackage ./layer-shell-qt.nix {}; - libkscreen = callPackage ./libkscreen {}; - libksysguard = callPackage ./libksysguard {}; - milou = callPackage ./milou.nix {}; - oxygen = callPackage ./oxygen.nix {}; - oxygen-sounds = callPackage ./oxygen-sounds.nix {}; - plank-player = callPackage ./plank-player.nix {}; - plasma-bigscreen = callPackage ./plasma-bigscreen.nix {}; - plasma-browser-integration = callPackage ./plasma-browser-integration.nix {}; - plasma-desktop = callPackage ./plasma-desktop {}; - plasma-disks = callPackage ./plasma-disks.nix {}; - plasma-integration = callPackage ./plasma-integration {}; - plasma-mobile = callPackage ./plasma-mobile {}; - plasma-nano = callPackage ./plasma-nano {}; - plasma-nm = callPackage ./plasma-nm {}; + 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 { }; + kpipewire = callPackage ./kpipewire.nix { }; + kscreen = callPackage ./kscreen.nix { }; + kscreenlocker = callPackage ./kscreenlocker.nix { }; + ksshaskpass = callPackage ./ksshaskpass.nix { }; + ksystemstats = callPackage ./ksystemstats.nix { }; + kwallet-pam = callPackage ./kwallet-pam.nix { }; + kwayland-integration = callPackage ./kwayland-integration.nix { }; + kwin = callPackage ./kwin { }; + kwrited = callPackage ./kwrited.nix { }; + layer-shell-qt = callPackage ./layer-shell-qt.nix { }; + libkscreen = callPackage ./libkscreen { }; + libksysguard = callPackage ./libksysguard { }; + milou = callPackage ./milou.nix { }; + oxygen = callPackage ./oxygen.nix { }; + oxygen-sounds = callPackage ./oxygen-sounds.nix { }; + plank-player = callPackage ./plank-player.nix { }; + plasma-bigscreen = callPackage ./plasma-bigscreen.nix { }; + plasma-browser-integration = callPackage ./plasma-browser-integration.nix { }; + plasma-desktop = callPackage ./plasma-desktop { }; + plasma-disks = callPackage ./plasma-disks.nix { }; + plasma-integration = callPackage ./plasma-integration { }; + plasma-mobile = callPackage ./plasma-mobile { }; + plasma-nano = callPackage ./plasma-nano { }; + plasma-nm = callPackage ./plasma-nm { }; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; - plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix {}; - plasma-sdk = callPackage ./plasma-sdk.nix {}; + plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix { }; + plasma-sdk = callPackage ./plasma-sdk.nix { }; plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; - plasma-vault = callPackage ./plasma-vault {}; - 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 {}; - qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix {}; - sddm-kcm = callPackage ./sddm-kcm.nix {}; - systemsettings = callPackage ./systemsettings.nix {}; - xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; + plasma-vault = callPackage ./plasma-vault { }; + 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 { }; + qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix { }; + sddm-kcm = callPackage ./sddm-kcm.nix { }; + systemsettings = callPackage ./systemsettings.nix { }; + xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix { }; thirdParty = let inherit (libsForQt5) callPackage; in { plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index 57800c316aa78..eb094c6871050 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -1,15 +1,32 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel, - kwindowsystem, kxmlgui, kcrash, qtbase +{ mkDerivation +, lib +, extra-cmake-modules +, boost +, kconfig +, kcoreaddons +, kdbusaddons +, ki18n +, kio +, kglobalaccel +, kwindowsystem +, kxmlgui +, kcrash +, qtbase }: mkDerivation { pname = "kactivitymanagerd"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem - kxmlgui kcrash + boost + kconfig + kcoreaddons + kdbusaddons + kglobalaccel + ki18n + kio + kwindowsystem + kxmlgui + kcrash ]; } diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index 02694b085f898..e02f1297c012e 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -1,15 +1,37 @@ -{ - lib, mkDerivation, extra-cmake-modules, kdoctools, - kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem, - qtsvg, qtx11extras, kactivities, plasma-workspace +{ lib +, mkDerivation +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfig +, kdesu +, ki18n +, kiconthemes +, kinit +, kio +, kwindowsystem +, qtsvg +, qtx11extras +, kactivities +, plasma-workspace }: mkDerivation { pname = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg - qtx11extras kactivities plasma-workspace + kcmutils + kconfig + kdesu + ki18n + kiconthemes + kinit + kio + kwindowsystem + qtsvg + qtx11extras + kactivities + plasma-workspace ]; postInstall = '' # install a symlink in bin so that kdesu can eventually be found in PATH diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 6949f73a9ce78..a61fc328236d2 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -1,17 +1,41 @@ -{ - mkDerivation, - extra-cmake-modules, wrapGAppsHook, - glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings-desktop-schemas, xsettingsd, kdecoration, sass +{ mkDerivation +, extra-cmake-modules +, wrapGAppsHook +, glib +, gtk2 +, gtk3 +, karchive +, kcmutils +, kconfigwidgets +, ki18n +, kiconthemes +, kio +, knewstuff +, gsettings-desktop-schemas +, xsettingsd +, kdecoration +, sass }: mkDerivation { pname = "kde-gtk-config"; nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ]; - dontWrapGApps = true; # There is nothing to wrap + dontWrapGApps = true; # There is nothing to wrap buildInputs = [ - ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings-desktop-schemas xsettingsd kdecoration sass + ki18n + kio + glib + gtk2 + gtk3 + karchive + kcmutils + kconfigwidgets + kiconthemes + knewstuff + gsettings-desktop-schemas + xsettingsd + kdecoration + sass ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index 5be47327d723d..b8461fbd108d9 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -1,18 +1,47 @@ -{ - mkDerivation, - extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, kcoreaddons, kcmutils, kholidays, - kio, knewstuff, kpurpose, kross, krunner, kservice, - kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative, - qtwebengine, qtx11extras +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kconfig +, kconfigwidgets +, kcoreaddons +, kcmutils +, kholidays +, kio +, knewstuff +, kpurpose +, kross +, krunner +, kservice +, kunitconversion +, ibus +, plasma-framework +, plasma-workspace +, qtdeclarative +, qtwebengine +, qtx11extras }: mkDerivation { pname = "kdeplasma-addons"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio - knewstuff kpurpose kross krunner kservice kunitconversion ibus - plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras + kconfig + kconfigwidgets + kcoreaddons + kcmutils + kholidays + kio + knewstuff + kpurpose + kross + krunner + kservice + kunitconversion + ibus + plasma-framework + plasma-workspace + qtdeclarative + qtwebengine + qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index be5b191c3de73..5c05eca479791 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,7 +1,13 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, ki18n, qtbase, qtx11extras, libXxf86vm +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kconfig +, kconfigwidgets +, ki18n +, qtbase +, qtx11extras +, libXxf86vm }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index dfd5d4668a22b..c30e1c4475826 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -1,17 +1,34 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - qtbase, - kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui, - plasma-framework, plasma-workspace, qtx11extras +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtbase +, kcmutils +, kdbusaddons +, kdelibs4support +, kglobalaccel +, ki18n +, kio +, kxmlgui +, plasma-framework +, plasma-workspace +, qtx11extras }: mkDerivation { pname = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui - plasma-framework plasma-workspace qtx11extras + kcmutils + kdbusaddons + kdelibs4support + kglobalaccel + ki18n + kio + kxmlgui + plasma-framework + plasma-workspace + qtx11extras ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index 662662cdb2fd7..c63d22858a551 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -1,22 +1,57 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - qtbase, - kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, - kdeclarative, ki18n, kiconthemes, kio, kirigami2, kpackage, kservice, - kwayland, kwidgetsaddons, kxmlgui, solid, systemsettings, - libraw1394, libGLU, pciutils, +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtbase +, kcmutils +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kio +, kirigami2 +, kpackage +, kservice +, kwayland +, kwidgetsaddons +, kxmlgui +, solid +, systemsettings +, libraw1394 +, libGLU +, pciutils }: mkDerivation { pname = "kinfocenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons - kdeclarative ki18n kiconthemes kio kirigami2 kpackage kservice kwayland - kwidgetsaddons kxmlgui solid systemsettings + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdeclarative + ki18n + kiconthemes + kio + kirigami2 + kpackage + kservice + kwayland + kwidgetsaddons + kxmlgui + solid + systemsettings - libraw1394 libGLU pciutils + libraw1394 + libGLU + pciutils ]; preFixup = '' # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix index 6a9d055abe437..57b327a7cdc40 100644 --- a/pkgs/desktops/plasma-5/kmenuedit.nix +++ b/pkgs/desktops/plasma-5/kmenuedit.nix @@ -1,14 +1,25 @@ -{ - mkDerivation, - extra-cmake-modules, kdoctools, - kdbusaddons, khotkeys, ki18n, kiconthemes, kio, kxmlgui, - sonnet +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kdbusaddons +, khotkeys +, ki18n +, kiconthemes +, kio +, kxmlgui +, sonnet }: mkDerivation { pname = "kmenuedit"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kdbusaddons khotkeys ki18n kiconthemes kio kxmlgui sonnet + kdbusaddons + khotkeys + ki18n + kiconthemes + kio + kxmlgui + sonnet ]; } diff --git a/pkgs/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix index 41191e6f4c6a4..fd412711e4a22 100644 --- a/pkgs/desktops/plasma-5/kpipewire.nix +++ b/pkgs/desktops/plasma-5/kpipewire.nix @@ -1,15 +1,28 @@ -{ - mkDerivation, - extra-cmake-modules, - kwayland, ki18n, kcoreaddons, plasma-wayland-protocols, - libepoxy, ffmpeg, mesa, pipewire, wayland +{ mkDerivation +, extra-cmake-modules +, kwayland +, ki18n +, kcoreaddons +, plasma-wayland-protocols +, libepoxy +, ffmpeg +, mesa +, pipewire +, wayland }: mkDerivation { pname = "kpipewire"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kwayland ki18n kcoreaddons plasma-wayland-protocols - libepoxy ffmpeg mesa pipewire wayland + kwayland + ki18n + kcoreaddons + plasma-wayland-protocols + libepoxy + ffmpeg + mesa + pipewire + wayland ]; } diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 0d67c702dd5c3..ca5ad59072f06 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -1,17 +1,44 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, - kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors, - kwindowsystem, kdeclarative, plasma-framework, qtx11extras, layer-shell-qt +{ mkDerivation +, extra-cmake-modules +, kconfig +, kcmutils +, kconfigwidgets +, kdbusaddons +, kglobalaccel +, ki18n +, kwidgetsaddons +, kxmlgui +, libkscreen +, qtdeclarative +, qtgraphicaleffects +, qtsensors +, kwindowsystem +, kdeclarative +, plasma-framework +, qtx11extras +, layer-shell-qt }: mkDerivation { pname = "kscreen"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n - kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors - kwindowsystem kdeclarative plasma-framework qtx11extras layer-shell-qt + kconfig + kcmutils + kconfigwidgets + kdbusaddons + kglobalaccel + ki18n + kwidgetsaddons + kxmlgui + libkscreen + qtdeclarative + qtgraphicaleffects + qtsensors + kwindowsystem + kdeclarative + plasma-framework + qtx11extras + layer-shell-qt ]; } diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index b37bbc6c8456e..d53d808e10844 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -1,17 +1,39 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kcmutils, kcrash, kdeclarative, kglobalaccel, kidletime, - kwayland, libXcursor, pam, plasma-framework, qtbase, qtdeclarative, qtx11extras, - wayland, layer-shell-qt, +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kcmutils +, kcrash +, kdeclarative +, kglobalaccel +, kidletime +, kwayland +, libXcursor +, pam +, plasma-framework +, qtbase +, qtdeclarative +, qtx11extras +, wayland +, layer-shell-qt }: mkDerivation { pname = "kscreenlocker"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kcrash kdeclarative kglobalaccel kidletime kwayland - libXcursor pam plasma-framework qtdeclarative qtx11extras wayland + kcmutils + kcrash + kdeclarative + kglobalaccel + kidletime + kwayland + libXcursor + pam + plasma-framework + qtdeclarative + qtx11extras + wayland layer-shell-qt ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index 4cbf08044934e..9a5ee90cd362e 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -1,7 +1,12 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase, +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kcoreaddons +, ki18n +, kwallet +, kwidgetsaddons +, qtbase }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix index d5f96e42981b5..6b04d055eac77 100644 --- a/pkgs/desktops/plasma-5/ksystemstats.nix +++ b/pkgs/desktops/plasma-5/ksystemstats.nix @@ -1,6 +1,10 @@ -{ mkDerivation, lib +{ mkDerivation +, lib , extra-cmake-modules -, libksysguard, libnl, lm_sensors, networkmanager-qt +, libksysguard +, libnl +, lm_sensors +, networkmanager-qt }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 5462814e8de2c..eab364d90d00e 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -1,8 +1,14 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, - wayland-protocols, wayland-scanner, wayland +{ mkDerivation +, lib +, extra-cmake-modules +, kguiaddons +, kidletime +, kwayland +, kwindowsystem +, qtbase +, wayland-protocols +, wayland-scanner +, wayland }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 46283eae26f4d..f8177c9290972 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,20 +1,61 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, fetchpatch, - - libepoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa, - pipewire, udev, wayland, xcb-util-cursor, xwayland, - plasma-wayland-protocols, wayland-protocols, libxcvt, - - qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors, - qtvirtualkeyboard, qtx11extras, - - breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets, - kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, - kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, - krunner, kscreenlocker, kservice, kwayland, kwidgetsaddons, - kwindowsystem, kxmlgui, plasma-framework, libqaccessibilityclient, - python3 +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, fetchpatch +, libepoxy +, lcms2 +, libICE +, libSM +, libcap +, libdrm +, libinput +, libxkbcommon +, mesa +, pipewire +, udev +, wayland +, xcb-util-cursor +, xwayland +, plasma-wayland-protocols +, wayland-protocols +, libxcvt +, qtdeclarative +, qtmultimedia +, qtquickcontrols2 +, qtscript +, qtsensors +, qtvirtualkeyboard +, qtx11extras +, breeze-qt5 +, kactivities +, kcompletion +, kcmutils +, kconfig +, kconfigwidgets +, kcoreaddons +, kcrash +, kdeclarative +, kdecoration +, kglobalaccel +, ki18n +, kiconthemes +, kidletime +, kinit +, kio +, knewstuff +, knotifications +, kpackage +, krunner +, kscreenlocker +, kservice +, kwayland +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, plasma-framework +, libqaccessibilityclient +, python3 }: # TODO (ttuegel): investigate qmlplugindump failure @@ -23,18 +64,60 @@ mkDerivation { pname = "kwin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire - udev wayland xcb-util-cursor xwayland - libxcvt plasma-wayland-protocols wayland-protocols + libepoxy + lcms2 + libICE + libSM + libcap + libdrm + libinput + libxkbcommon + mesa + pipewire + udev + wayland + xcb-util-cursor + xwayland + libxcvt + plasma-wayland-protocols + wayland-protocols - qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors - qtvirtualkeyboard qtx11extras + qtdeclarative + qtmultimedia + qtquickcontrols2 + qtscript + qtsensors + qtvirtualkeyboard + qtx11extras - breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets - kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes - kidletime kinit kio knewstuff knotifications kpackage krunner kscreenlocker - kservice kwayland kwidgetsaddons kwindowsystem kxmlgui - plasma-framework libqaccessibilityclient + breeze-qt5 + kactivities + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kcrash + kdeclarative + kdecoration + kglobalaccel + ki18n + kiconthemes + kidletime + kinit + kio + knewstuff + knotifications + kpackage + krunner + kscreenlocker + kservice + kwayland + kwidgetsaddons + kwindowsystem + kxmlgui + plasma-framework + libqaccessibilityclient ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index 9ba1afaf9f836..3f19acea6bdc3 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -1,7 +1,12 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase, +{ mkDerivation +, lib +, extra-cmake-modules +, kcoreaddons +, kdbusaddons +, ki18n +, knotifications +, kpty +, qtbase }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix index 8126377955314..721eee4937300 100644 --- a/pkgs/desktops/plasma-5/layer-shell-qt.nix +++ b/pkgs/desktops/plasma-5/layer-shell-qt.nix @@ -1,6 +1,14 @@ -{ mkDerivation, lib +{ mkDerivation +, lib , extra-cmake-modules -, kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, wayland-scanner, wayland, wayland-protocols +, kguiaddons +, kidletime +, kwayland +, kwindowsystem +, qtbase +, wayland-scanner +, wayland +, wayland-protocols }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index cebe1ad4451e3..ad9ddc95c0453 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -1,10 +1,15 @@ -{ - mkDerivation, lib, propagate, - extra-cmake-modules, - qtbase, - wayland-scanner, kconfig, kwayland, - plasma-wayland-protocols, wayland, - libXrandr, qtx11extras +{ mkDerivation +, lib +, propagate +, extra-cmake-modules +, qtbase +, wayland-scanner +, kconfig +, kwayland +, plasma-wayland-protocols +, wayland +, libXrandr +, qtx11extras }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index ef4e443844484..8e9be6f743cf9 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -1,9 +1,26 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, - knewstuff, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, - qtbase, qtscript, qtwebengine, qtx11extras, libnl, libpcap, qtsensors, lm_sensors, +{ mkDerivation +, lib +, extra-cmake-modules +, kauth +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, ki18n +, kiconthemes +, knewstuff +, kservice +, kwidgetsaddons +, kwindowsystem +, plasma-framework +, qtbase +, qtscript +, qtwebengine +, qtx11extras +, libnl +, libpcap +, qtsensors +, lm_sensors }: mkDerivation { @@ -13,9 +30,25 @@ mkDerivation { ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets - kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras - qtwebengine knewstuff libnl libpcap qtsensors lm_sensors + kauth + kconfig + ki18n + kiconthemes + kwindowsystem + kcompletion + kconfigwidgets + kcoreaddons + kservice + kwidgetsaddons + plasma-framework + qtscript + qtx11extras + qtwebengine + knewstuff + libnl + libpcap + qtsensors + lm_sensors ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index 8ae5061436d1a..87f5f3b170f2d 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -1,15 +1,30 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kcoreaddons, kdeclarative, ki18n, kitemmodels, krunner, kservice, - plasma-framework, qtbase, qtscript, qtdeclarative +{ mkDerivation +, lib +, extra-cmake-modules +, kcoreaddons +, kdeclarative +, ki18n +, kitemmodels +, krunner +, kservice +, plasma-framework +, qtbase +, qtscript +, qtdeclarative }: mkDerivation { pname = "milou"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework - qtdeclarative qtscript + kcoreaddons + kdeclarative + ki18n + kitemmodels + krunner + kservice + plasma-framework + qtdeclarative + qtscript ]; } diff --git a/pkgs/desktops/plasma-5/oxygen-sounds.nix b/pkgs/desktops/plasma-5/oxygen-sounds.nix index ddb5be869bea9..78fdebc416c8e 100644 --- a/pkgs/desktops/plasma-5/oxygen-sounds.nix +++ b/pkgs/desktops/plasma-5/oxygen-sounds.nix @@ -1,6 +1,5 @@ -{ - mkDerivation, - extra-cmake-modules, +{ mkDerivation +, extra-cmake-modules }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index 78603c3c306a2..a9e4eb18820b9 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -1,18 +1,39 @@ -{ - mkDerivation, - extra-cmake-modules, - frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, - ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative, - qtx11extras, libXdmcp +{ mkDerivation +, extra-cmake-modules +, frameworkintegration +, kcmutils +, kcompletion +, kconfig +, kdecoration +, kguiaddons +, ki18n +, kwidgetsaddons +, kservice +, kwayland +, kwindowsystem +, qtdeclarative +, qtx11extras +, libXdmcp }: mkDerivation { pname = "oxygen"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ - frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons - ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative - qtx11extras libXdmcp + frameworkintegration + kcmutils + kcompletion + kconfig + kdecoration + kguiaddons + ki18n + kservice + kwayland + kwidgetsaddons + kwindowsystem + qtdeclarative + qtx11extras + libXdmcp ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/plank-player.nix b/pkgs/desktops/plasma-5/plank-player.nix index 536db96ef3c3d..f67cd8728ee7e 100644 --- a/pkgs/desktops/plasma-5/plank-player.nix +++ b/pkgs/desktops/plasma-5/plank-player.nix @@ -1,10 +1,9 @@ -{ - mkDerivation, - extra-cmake-modules, - qtquickcontrols2, - qtmultimedia, - kirigami2, - ki18n, +{ mkDerivation +, extra-cmake-modules +, qtquickcontrols2 +, qtmultimedia +, kirigami2 +, ki18n }: mkDerivation { pname = "plank-player"; diff --git a/pkgs/desktops/plasma-5/plasma-bigscreen.nix b/pkgs/desktops/plasma-5/plasma-bigscreen.nix index 96b7b148fa084..f94b49efabc79 100644 --- a/pkgs/desktops/plasma-5/plasma-bigscreen.nix +++ b/pkgs/desktops/plasma-5/plasma-bigscreen.nix @@ -1,19 +1,18 @@ -{ - mkDerivation, - extra-cmake-modules, - kactivities, - kactivities-stats, - plasma-framework, - ki18n, - kirigami2, - kdeclarative, - kcmutils, - knotifications, - kio, - kwayland, - kwindowsystem, - plasma-workspace, - qtmultimedia, +{ mkDerivation +, extra-cmake-modules +, kactivities +, kactivities-stats +, plasma-framework +, ki18n +, kirigami2 +, kdeclarative +, kcmutils +, knotifications +, kio +, kwayland +, kwindowsystem +, plasma-workspace +, qtmultimedia }: mkDerivation { pname = "plasma-bigscreen"; diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix index 1ddd844444d80..dcd895efbbc73 100644 --- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-browser-integration.nix @@ -1,9 +1,17 @@ -{ - mkDerivation, - extra-cmake-modules, - qtbase, - kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose, - krunner, kwindowsystem, kactivities, plasma-workspace +{ mkDerivation +, extra-cmake-modules +, qtbase +, kfilemetadata +, kio +, ki18n +, kconfig +, kdbusaddons +, knotifications +, kpurpose +, krunner +, kwindowsystem +, kactivities +, plasma-workspace }: mkDerivation { @@ -12,7 +20,17 @@ mkDerivation { extra-cmake-modules ]; buildInputs = [ - qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose - krunner kwindowsystem kactivities plasma-workspace + qtbase + kfilemetadata + kio + ki18n + kconfig + kdbusaddons + knotifications + kpurpose + krunner + kwindowsystem + kactivities + plasma-workspace ]; } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 6ab13f0c7261b..5c71b38eaaf12 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,36 +1,115 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, wayland-scanner, - - boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, - libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, - xorgserver, util-linux, wayland, wayland-protocols, - - accounts-qt, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, - qtx11extras, - - attica, baloo, kaccounts-integration, kactivities, kactivities-stats, kauth, - kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, - kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, - kpeople, krunner, kscreenlocker, kwallet, kwin, phonon, - plasma-framework, plasma-workspace, qqc2-desktop-style, xf86inputlibinput +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, wayland-scanner +, boost +, fontconfig +, ibus +, libXcursor +, libXft +, libcanberra_kde +, libpulseaudio +, libxkbfile +, xf86inputevdev +, xf86inputsynaptics +, xinput +, xkeyboard_config +, xorgserver +, util-linux +, wayland +, wayland-protocols +, accounts-qt +, qtdeclarative +, qtquickcontrols +, qtquickcontrols2 +, qtsvg +, qtx11extras +, attica +, baloo +, kaccounts-integration +, kactivities +, kactivities-stats +, kauth +, kcmutils +, kdbusaddons +, kdeclarative +, kded +, kdelibs4support +, kemoticons +, kglobalaccel +, ki18n +, kitemmodels +, knewstuff +, knotifications +, knotifyconfig +, kpeople +, krunner +, kscreenlocker +, kwallet +, kwin +, phonon +, plasma-framework +, plasma-workspace +, qqc2-desktop-style +, xf86inputlibinput }: mkDerivation { pname = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ]; buildInputs = [ - boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver - libxkbfile phonon xf86inputlibinput xf86inputevdev xf86inputsynaptics xinput - xkeyboard_config wayland wayland-protocols + boost + fontconfig + ibus + libcanberra_kde + libpulseaudio + libXcursor + libXft + xorgserver + libxkbfile + phonon + xf86inputlibinput + xf86inputevdev + xf86inputsynaptics + xinput + xkeyboard_config + wayland + wayland-protocols - accounts-qt qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras + accounts-qt + qtdeclarative + qtquickcontrols + qtquickcontrols2 + qtsvg + qtx11extras - attica baloo kaccounts-integration kactivities kactivities-stats kauth - kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons - kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig - kpeople krunner kscreenlocker kwallet kwin plasma-framework - plasma-workspace qqc2-desktop-style + attica + baloo + kaccounts-integration + kactivities + kactivities-stats + kauth + kcmutils + kdbusaddons + kdeclarative + kded + kdelibs4support + kemoticons + kglobalaccel + ki18n + kitemmodels + knewstuff + knotifications + knotifyconfig + kpeople + krunner + kscreenlocker + kwallet + kwin + plasma-framework + plasma-workspace + qqc2-desktop-style ]; patches = [ diff --git a/pkgs/desktops/plasma-5/plasma-disks.nix b/pkgs/desktops/plasma-5/plasma-disks.nix index 8ddd53548e750..801bf4d978b3b 100644 --- a/pkgs/desktops/plasma-5/plasma-disks.nix +++ b/pkgs/desktops/plasma-5/plasma-disks.nix @@ -1,18 +1,49 @@ -{ - mkDerivation, extra-cmake-modules, kdoctools, - kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, - kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, - kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace, - systemsettings +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfig +, kdbusaddons +, khtml +, ki18n +, kiconthemes +, kio +, kitemviews +, kservice +, kwindowsystem +, kxmlgui +, qtquickcontrols +, qtquickcontrols2 +, kactivities +, kactivities-stats +, kirigami2 +, kcrash +, plasma-workspace +, systemsettings }: mkDerivation { pname = "plasma-disks"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice - kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 - kactivities kactivities-stats kirigami2 kcrash plasma-workspace + kcmutils + kconfig + kdbusaddons + khtml + ki18n + kiconthemes + kio + kitemviews + kservice + kwindowsystem + kxmlgui + qtquickcontrols + qtquickcontrols2 + kactivities + kactivities-stats + kirigami2 + kcrash + plasma-workspace systemsettings ]; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix index 2c6bd8337ff17..f88b737e0ec79 100644 --- a/pkgs/desktops/plasma-5/plasma-integration/default.nix +++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix @@ -1,9 +1,17 @@ -{ - mkDerivation, - extra-cmake-modules, - breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications, - kwayland, libXcursor, qtquickcontrols2, wayland, wayland-protocols, - plasma-wayland-protocols +{ mkDerivation +, extra-cmake-modules +, breeze-qt5 +, kconfig +, kconfigwidgets +, kiconthemes +, kio +, knotifications +, kwayland +, libXcursor +, qtquickcontrols2 +, wayland +, wayland-protocols +, plasma-wayland-protocols }: # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration @@ -12,8 +20,17 @@ mkDerivation { pname = "plasma-integration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland - libXcursor qtquickcontrols2 wayland wayland-protocols + breeze-qt5 + kconfig + kconfigwidgets + kiconthemes + kio + knotifications + kwayland + libXcursor + qtquickcontrols2 + wayland + wayland-protocols plasma-wayland-protocols ]; } diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index 41324d53b6a77..ce0da404bb595 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -1,16 +1,36 @@ -{ - mkDerivation, lib, - - extra-cmake-modules, kdoctools, - - coreutils, dbus, gnugrep, gnused, libdbusmenu, pam, wayland, appstream, - - kdeclarative, kdelibs4support, kpeople, kconfig, krunner, kinit, kwayland, kwin, - plasma-framework, telepathy, libphonenumber, protobuf, libqofono, modemmanager-qt, - networkmanager-qt, plasma-workspace, - maliit-framework, maliit-keyboard, qtfeedback, - - qtwayland, qttools +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, coreutils +, dbus +, gnugrep +, gnused +, libdbusmenu +, pam +, wayland +, appstream +, kdeclarative +, kdelibs4support +, kpeople +, kconfig +, krunner +, kinit +, kwayland +, kwin +, plasma-framework +, telepathy +, libphonenumber +, protobuf +, libqofono +, modemmanager-qt +, networkmanager-qt +, plasma-workspace +, maliit-framework +, maliit-keyboard +, qtfeedback +, qtwayland +, qttools }: let inherit (lib) getBin getLib; in @@ -20,10 +40,29 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - appstream libdbusmenu pam wayland - kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin - plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt - networkmanager-qt maliit-framework maliit-keyboard plasma-workspace qtfeedback + appstream + libdbusmenu + pam + wayland + kdeclarative + kdelibs4support + kpeople + kconfig + krunner + kinit + kwayland + kwin + plasma-framework + telepathy + libphonenumber + protobuf + libqofono + modemmanager-qt + networkmanager-qt + maliit-framework + maliit-keyboard + plasma-workspace + qtfeedback ]; postPatch = '' diff --git a/pkgs/desktops/plasma-5/plasma-nano/default.nix b/pkgs/desktops/plasma-5/plasma-nano/default.nix index 6e2608c7f97b1..50f0d321b394e 100644 --- a/pkgs/desktops/plasma-5/plasma-nano/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nano/default.nix @@ -1,7 +1,6 @@ -{ - mkDerivation, - extra-cmake-modules, - plasma-framework +{ mkDerivation +, extra-cmake-modules +, plasma-framework }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 28331fc707380..99f4033303f9e 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,27 +1,70 @@ -{ - mkDerivation, lib, substituteAll, - extra-cmake-modules, kdoctools, - kcmutils, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, - ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet, - kwidgetsaddons, kwindowsystem, kxmlgui, plasma-framework, prison, solid, - - mobile-broadband-provider-info, openconnect, openvpn, - modemmanager-qt, networkmanager-qt, qca-qt5, - qtbase, qtdeclarative, qttools, +{ mkDerivation +, lib +, substituteAll +, extra-cmake-modules +, kdoctools +, kcmutils +, kcompletion +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kinit +, kio +, kitemviews +, knotifications +, kservice +, kwallet +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, plasma-framework +, prison +, solid +, mobile-broadband-provider-info +, openconnect +, openvpn +, modemmanager-qt +, networkmanager-qt +, qca-qt5 +, qtbase +, qtdeclarative +, qttools }: mkDerivation { pname = "plasma-nm"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ - kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion - kcmutils kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui - prison solid + kdeclarative + ki18n + kio + kwindowsystem + plasma-framework + kcompletion + kcmutils + kconfigwidgets + kcoreaddons + kdbusaddons + kiconthemes + kinit + kitemviews + knotifications + kservice + kwallet + kwidgetsaddons + kxmlgui + prison + solid qtdeclarative - modemmanager-qt networkmanager-qt qca-qt5 - mobile-broadband-provider-info openconnect + modemmanager-qt + networkmanager-qt + qca-qt5 + mobile-broadband-provider-info + openconnect ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index b0a4e614bf326..07170892f2799 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,20 +1,44 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kcmutils, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework, - qtbase, qtdeclarative, - gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfigwidgets +, kcoreaddons +, kdeclarative +, kglobalaccel +, ki18n +, kwindowsystem +, plasma-framework +, qtbase +, qtdeclarative +, gconf +, glib +, libcanberra-gtk3 +, libpulseaudio +, sound-theme-freedesktop }: mkDerivation { pname = "plasma-pa"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop + gconf + glib + libcanberra-gtk3 + libpulseaudio + sound-theme-freedesktop - kcmutils kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework + kcmutils + kconfigwidgets + kcoreaddons + kdeclarative + kglobalaccel + ki18n + plasma-framework kwindowsystem - qtbase qtdeclarative + qtbase + qtdeclarative ]; } diff --git a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix index a1688e939c7ba..3f169244fdaff 100644 --- a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix +++ b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix @@ -1,22 +1,21 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfig, - knotifications, - ki18n, - solid, - kcoreaddons, - kdeclarative, - kcmutils, - kpackage, - kwindowsystem, - wayland, - pkg-config, - libcec, - libcec_platform, - libevdev, - plasma-workspace, - plasma-wayland-protocols, +{ mkDerivation +, extra-cmake-modules +, kconfig +, knotifications +, ki18n +, solid +, kcoreaddons +, kdeclarative +, kcmutils +, kpackage +, kwindowsystem +, wayland +, pkg-config +, libcec +, libcec_platform +, libevdev +, plasma-workspace +, plasma-wayland-protocols }: mkDerivation { pname = "plasma-remotecontrollers"; diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix index b6ceb37a71ff3..ba1def5304762 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/default.nix +++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix @@ -1,16 +1,14 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - - kactivities, - plasma-framework, - kwindowsystem, - networkmanager-qt, - libksysguard, - - encfs, - cryfs, - fuse +{ mkDerivation +, lib +, extra-cmake-modules +, kactivities +, plasma-framework +, kwindowsystem +, networkmanager-qt +, libksysguard +, encfs +, cryfs +, fuse }: mkDerivation { @@ -24,7 +22,10 @@ mkDerivation { ]; buildInputs = [ - kactivities plasma-framework kwindowsystem libksysguard + kactivities + plasma-framework + kwindowsystem + libksysguard networkmanager-qt ]; diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix index 8ae136ac78ba2..799973c215383 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix @@ -1,4 +1,4 @@ -{ mkDerivation , extra-cmake-modules }: +{ mkDerivation, extra-cmake-modules }: mkDerivation { pname = "plasma-workspace-wallpapers"; diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 27fb2b0c594e9..252b6a9fac557 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -1,23 +1,72 @@ -{ - mkDerivation, lib, - - extra-cmake-modules, kdoctools, - - coreutils, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, - libXtst, libXft, pam, wayland, xmessage, xsetroot, - - baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash, - kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, - kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner, - kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, - kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt, - phonon, plasma-framework, prison, solid, kholidays, kquickcharts, - appstream-qt, plasma-wayland-protocols, kpipewire, libkexiv2, - - qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, - qtwayland, qtx11extras, qqc2-desktop-style, polkit-qt, - - pipewire, libdrm +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, coreutils +, gnugrep +, gnused +, isocodes +, libdbusmenu +, libSM +, libXcursor +, libXtst +, libXft +, pam +, wayland +, xmessage +, xsetroot +, baloo +, breeze-qt5 +, kactivities +, kactivities-stats +, kcmutils +, kconfig +, kcrash +, kdbusaddons +, kdeclarative +, kdelibs4support +, kdesu +, kglobalaccel +, kidletime +, kinit +, kjsembed +, knewstuff +, knotifyconfig +, kpackage +, kpeople +, krunner +, kscreenlocker +, ktexteditor +, ktextwidgets +, kwallet +, kwayland +, kwin +, kxmlrpcclient +, libkscreen +, libksysguard +, libqalculate +, networkmanager-qt +, phonon +, plasma-framework +, prison +, solid +, kholidays +, kquickcharts +, appstream-qt +, plasma-wayland-protocols +, kpipewire +, libkexiv2 +, qtgraphicaleffects +, qtquickcontrols +, qtquickcontrols2 +, qtscript +, qttools +, qtwayland +, qtx11extras +, qqc2-desktop-style +, polkit-qt +, pipewire +, libdrm }: let inherit (lib) getBin getLib; in @@ -28,20 +77,66 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - isocodes libdbusmenu libSM libXcursor libXtst libXft pam wayland - - baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons - kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff - knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor - ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard - libqalculate networkmanager-qt phonon plasma-framework prison solid - kholidays kquickcharts appstream-qt plasma-wayland-protocols kpipewire + isocodes + libdbusmenu + libSM + libXcursor + libXtst + libXft + pam + wayland + + baloo + kactivities + kactivities-stats + kcmutils + kconfig + kcrash + kdbusaddons + kdeclarative + kdelibs4support + kdesu + kglobalaccel + kidletime + kjsembed + knewstuff + knotifyconfig + kpackage + kpeople + krunner + kscreenlocker + ktexteditor + ktextwidgets + kwallet + kwayland + kwin + kxmlrpcclient + libkscreen + libksysguard + libqalculate + networkmanager-qt + phonon + plasma-framework + prison + solid + kholidays + kquickcharts + appstream-qt + plasma-wayland-protocols + kpipewire libkexiv2 - qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland - qtx11extras qqc2-desktop-style polkit-qt - - pipewire libdrm + qtgraphicaleffects + qtquickcontrols + qtquickcontrols2 + qtscript + qtwayland + qtx11extras + qqc2-desktop-style + polkit-qt + + pipewire + libdrm ]; propagatedUserEnvPkgs = [ qtgraphicaleffects ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 82ebf3e313652..3f4387ed5f346 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -1,15 +1,33 @@ -{ - mkDerivation, lib, extra-cmake-modules, - kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications, - kwidgetsaddons, kwindowsystem, polkit-qt, qtbase +{ mkDerivation +, lib +, extra-cmake-modules +, kcoreaddons +, kconfig +, kcrash +, kdbusaddons +, ki18n +, kiconthemes +, knotifications +, kwidgetsaddons +, kwindowsystem +, polkit-qt +, qtbase }: mkDerivation { pname = "polkit-kde-agent"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ - kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes - knotifications kwindowsystem polkit-qt + kdbusaddons + kwidgetsaddons + kcoreaddons + kcrash + kconfig + ki18n + kiconthemes + knotifications + kwindowsystem + polkit-qt ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index bb511c21ba67f..d60f9701dee6f 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,17 +1,45 @@ -{ - mkDerivation, - extra-cmake-modules, kdoctools, - bluez-qt, kactivities, kauth, kconfig, kdbusaddons, - kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, - networkmanager-qt, plasma-workspace, qtx11extras, solid, udev +{ mkDerivation +, extra-cmake-modules +, kdoctools +, bluez-qt +, kactivities +, kauth +, kconfig +, kdbusaddons +, kglobalaccel +, ki18n +, kidletime +, kio +, knotifyconfig +, kwayland +, libkscreen +, networkmanager-qt +, plasma-workspace +, qtx11extras +, solid +, udev }: mkDerivation { pname = "powerdevil"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth - kglobalaccel ki18n kio kidletime kwayland libkscreen - networkmanager-qt plasma-workspace qtx11extras + kconfig + kdbusaddons + knotifyconfig + solid + udev + bluez-qt + kactivities + kauth + kglobalaccel + ki18n + kio + kidletime + kwayland + libkscreen + networkmanager-qt + plasma-workspace + qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index c83bbcecf5678..94d8f92ac4f94 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -1,17 +1,48 @@ -{ - mkDerivation, extra-cmake-modules, kdoctools, - kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, - kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, - kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfig +, kdbusaddons +, khtml +, ki18n +, kiconthemes +, kio +, kitemviews +, kservice +, kwindowsystem +, kxmlgui +, qtquickcontrols +, qtquickcontrols2 +, kactivities +, kactivities-stats +, kirigami2 +, kcrash +, plasma-workspace }: mkDerivation { pname = "systemsettings"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice - kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 - kactivities kactivities-stats kirigami2 kcrash plasma-workspace + kcmutils + kconfig + kdbusaddons + khtml + ki18n + kiconthemes + kio + kitemviews + kservice + kwindowsystem + kxmlgui + qtquickcontrols + qtquickcontrols2 + kactivities + kactivities-stats + kirigami2 + kcrash + plasma-workspace ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 00533367d4ce4..dc5728791b609 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,19 +1,49 @@ -{ - mkDerivation, lib, - extra-cmake-modules, gettext, kdoctools, - cups, libepoxy, mesa, pcre, pipewire, wayland, wayland-protocols, - kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, - kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio, - qtbase +{ mkDerivation +, lib +, extra-cmake-modules +, gettext +, kdoctools +, cups +, libepoxy +, mesa +, pcre +, pipewire +, wayland +, wayland-protocols +, kcoreaddons +, knotifications +, kwayland +, kwidgetsaddons +, kwindowsystem +, kirigami2 +, kdeclarative +, plasma-framework +, plasma-wayland-protocols +, kio +, qtbase }: mkDerivation { pname = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; buildInputs = [ - cups libepoxy mesa pcre pipewire wayland wayland-protocols + cups + libepoxy + mesa + pcre + pipewire + wayland + wayland-protocols - kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem - kirigami2 kdeclarative plasma-framework plasma-wayland-protocols + kio + kcoreaddons + knotifications + kwayland + kwidgetsaddons + kwindowsystem + kirigami2 + kdeclarative + plasma-framework + plasma-wayland-protocols ]; } |