diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-16 19:08:06 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-16 19:08:06 -0600 |
commit | 0a81a0d8ffa824217e0a2fe58972467a7a92b966 (patch) | |
tree | 089a3e101308aa2916f8eb3a2e6fffbfc57e4c32 /pkgs/desktops | |
parent | 61176d89873543ab0c805b1d193c078a6bc34c4a (diff) |
kde5: Frameworks 5.17, Plasma 5.5.1, Applications 15.12.0
The stable `kde5` attribute is updated to these versions. The old versions have been removed.
Diffstat (limited to 'pkgs/desktops')
46 files changed, 0 insertions, 2070 deletions
diff --git a/pkgs/desktops/plasma-5.4/bluedevil.nix b/pkgs/desktops/plasma-5.4/bluedevil.nix deleted file mode 100644 index d099e95a16b47..0000000000000 --- a/pkgs/desktops/plasma-5.4/bluedevil.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons -, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications -, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework -, qtdeclarative, shared_mime_info -}: - -plasmaPackage { - name = "bluedevil"; - nativeBuildInputs = [ - extra-cmake-modules makeQtWrapper shared_mime_info - ]; - buildInputs = [ - kcoreaddons kdbusaddons kded kiconthemes knotifications - kwidgetsaddons - ]; - propagatedBuildInputs = [ - bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative - ]; - postInstall = '' - wrapQtProgram "$out/bin/bluedevil-wizard" - wrapQtProgram "$out/bin/bluedevil-sendfile" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/breeze-qt4.nix b/pkgs/desktops/plasma-5.4/breeze-qt4.nix deleted file mode 100644 index f8092bc9d376c..0000000000000 --- a/pkgs/desktops/plasma-5.4/breeze-qt4.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ plasmaPackage -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -, qt4 -, xproto -}: - -plasmaPackage { - name = "breeze-qt4"; - sname = "breeze"; - buildInputs = [ - kdelibs - qt4 - xproto - ]; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; - cmakeFlags = [ - "-DUSE_KDE4=ON" - "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake" - ]; -} diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix deleted file mode 100644 index f50179ef64ceb..0000000000000 --- a/pkgs/desktops/plasma-5.4/breeze-qt5.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, frameworkintegration -, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons -, ki18n, kwindowsystem, makeQtWrapper, qtx11extras -}: - -plasmaPackage { - name = "breeze-qt5"; - sname = "breeze"; - nativeBuildInputs = [ - extra-cmake-modules - makeQtWrapper - ]; - buildInputs = [ - kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons - ]; - propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ]; - cmakeFlags = [ "-DUSE_Qt4=OFF" ]; - postInstall = '' - wrapQtProgram "$out/bin/breeze-settings5" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/default.nix b/pkgs/desktops/plasma-5.4/default.nix deleted file mode 100644 index 570134d824f3b..0000000000000 --- a/pkgs/desktops/plasma-5.4/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -# Maintainer's Notes: -# -# How To Update -# 1. Edit the URL in ./manifest.sh -# 2. Run ./manifest.sh -# 3. Fix build errors. - -{ pkgs, debug ? false }: - -let - - inherit (pkgs) lib stdenv symlinkJoin; - - kf5 = pkgs.kf514; - kdeApps = pkgs.kdeApps_15_08; - - srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; - mirror = "mirror://kde"; - - plasmaPackage = args: - let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - setupHook = args.setupHook or ./setup-hook.sh; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - 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 {}); - }); - - addPackages = self: with self; { - bluedevil = callPackage ./bluedevil.nix {}; - breeze-qt4 = callPackage ./breeze-qt4.nix {}; - breeze-qt5 = callPackage ./breeze-qt5.nix {}; - breeze = - let version = (builtins.parseDrvName breeze-qt5.name).version; - in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ]; - kde-cli-tools = callPackage ./kde-cli-tools.nix {}; - kde-gtk-config = callPackage ./kde-gtk-config {}; - kdecoration = callPackage ./kdecoration.nix {}; - kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; - kgamma5 = callPackage ./kgamma5.nix {}; - khelpcenter = callPackage ./khelpcenter.nix {}; - khotkeys = callPackage ./khotkeys.nix {}; - kinfocenter = callPackage ./kinfocenter.nix {}; - kmenuedit = callPackage ./kmenuedit.nix {}; - kscreen = callPackage ./kscreen.nix {}; - ksshaskpass = callPackage ./ksshaskpass.nix {}; - ksysguard = callPackage ./ksysguard.nix {}; - kwayland = callPackage ./kwayland.nix {}; - kwin = callPackage ./kwin {}; - kwrited = callPackage ./kwrited.nix {}; - libkscreen = callPackage ./libkscreen {}; - libksysguard = callPackage ./libksysguard {}; - milou = callPackage ./milou.nix {}; - oxygen = callPackage ./oxygen.nix {}; - oxygen-fonts = callPackage ./oxygen-fonts.nix {}; - plasma-desktop = callPackage ./plasma-desktop {}; - plasma-mediacenter = callPackage ./plasma-mediacenter.nix {}; - plasma-nm = callPackage ./plasma-nm {}; - plasma-pa = callPackage ./plasma-pa.nix {}; - 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 {}; - systemsettings = callPackage ./systemsettings.nix {}; - }; - - newScope = scope: kdeApps.newScope ({ inherit plasmaPackage; } // scope); - -in lib.makeScope newScope addPackages diff --git a/pkgs/desktops/plasma-5.4/fetchsrcs.sh b/pkgs/desktops/plasma-5.4/fetchsrcs.sh deleted file mode 100755 index db2db8f8e56d3..0000000000000 --- a/pkgs/desktops/plasma-5.4/fetchsrcs.sh +++ /dev/null @@ -1,57 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils findutils gawk gnused nix wget - -set -x - -# The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/plasma/5.4.3/" -EXTRA_WGET_ARGS='-A *.tar.xz' - -mkdir tmp; cd tmp - -rm -f ../srcs.csv - -wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS - -find . | while read src; do - if [[ -f "${src}" ]]; then - # Sanitize file name - filename=$(basename "$src" | tr '@' '_') - nameVersion="${filename%.tar.*}" - name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') - version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') - echo "$name,$version,$src,$filename" >>../srcs.csv - fi -done - -cat >../srcs.nix <<EOF -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ -EOF - -gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do - versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv) - latestVersion=$(echo "$versions" | sort -rV | head -n 1) - src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv) - filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv) - url="${src:2}" - sha256=$(nix-hash --type sha256 --base32 --flat "$src") - cat >>../srcs.nix <<EOF - $name = { - version = "$latestVersion"; - src = fetchurl { - url = "\${mirror}/$url"; - sha256 = "$sha256"; - name = "$filename"; - }; - }; -EOF -done - -echo "}" >>../srcs.nix - -rm -f ../srcs.csv - -cd .. diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix deleted file mode 100644 index 7f19af6959ec2..0000000000000 --- a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig -, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes -, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras -}: - -plasmaPackage { - name = "kde-cli-tools"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kcmutils kconfig kdesu kiconthemes - ]; - propagatedBuildInputs = [ - kdelibs4support ki18n kwindowsystem qtsvg qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/kmimetypefinder5" - wrapQtProgram "$out/bin/ksvgtopng5" - wrapQtProgram "$out/bin/ktraderclient5" - wrapQtProgram "$out/bin/kioclient5" - wrapQtProgram "$out/bin/kdecp5" - wrapQtProgram "$out/bin/keditfiletype5" - wrapQtProgram "$out/bin/kcmshell5" - wrapQtProgram "$out/bin/kdemv5" - wrapQtProgram "$out/bin/kstart5" - wrapQtProgram "$out/bin/kde-open5" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch deleted file mode 100644 index 759eda4cc134c..0000000000000 --- a/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Tue, 27 Oct 2015 18:07:54 -0500 -Subject: [PATCH] follow symlinks - ---- - src/appearancegtk2.cpp | 2 +- - src/iconthemesmodel.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp -index b1e0b52..095cddc 100644 ---- a/src/appearancegtk2.cpp -+++ b/src/appearancegtk2.cpp -@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const - QStringList themes=installedThemes(); - themes=themes.filter(QRegExp("/"+themeName+"/?$")); - if(themes.size()==1) { -- QDirIterator it(themes.first(), QDirIterator::Subdirectories); -+ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while(it.hasNext()) { - it.next(); - if(it.fileName()=="gtkrc") { -diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp -index 07c7ad7..b04d978 100644 ---- a/src/iconthemesmodel.cpp -+++ b/src/iconthemesmodel.cpp -@@ -46,7 +46,7 @@ QList<QDir> IconThemesModel::installedThemesPaths() - - foreach(const QString& dir, dirs) { - QDir userIconsDir(dir); -- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks); -+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs); - while(it.hasNext()) { - QString currentPath = it.next(); - QDir dir(currentPath); --- -2.6.2 - diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix deleted file mode 100644 index 6b41599994d5f..0000000000000 --- a/pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -, glib -, gtk2 -, gtk3 -, karchive -, kcmutils -, kconfigwidgets -, ki18n -, kiconthemes -, kio -, knewstuff -}: - -plasmaPackage { - name = "kde-gtk-config"; - patches = [ ./0001-follow-symlinks.patch ]; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff - ]; - propagatedBuildInputs = [ ki18n kio ]; - cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" - ]; -} diff --git a/pkgs/desktops/plasma-5.4/kdecoration.nix b/pkgs/desktops/plasma-5.4/kdecoration.nix deleted file mode 100644 index eb65f7f90afbe..0000000000000 --- a/pkgs/desktops/plasma-5.4/kdecoration.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ plasmaPackage, extra-cmake-modules }: - -plasmaPackage { - name = "kdecoration"; - nativeBuildInputs = [ extra-cmake-modules ]; -} diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix deleted file mode 100644 index d6a96a3276d75..0000000000000 --- a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig -, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n -, kio, knewstuff, kross, krunner, kservice, kunitconversion -, plasma-framework, qtdeclarative, qtx11extras -}: - -plasmaPackage { - name = "kdeplasma-addons"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - ibus kconfig kconfigwidgets kcoreaddons kcmutils - knewstuff kservice kunitconversion - ]; - propagatedBuildInputs = [ - kdelibs4support kio kross krunner plasma-framework qtdeclarative - qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5.4/kgamma5.nix b/pkgs/desktops/plasma-5.4/kgamma5.nix deleted file mode 100644 index 965c33e6eef8d..0000000000000 --- a/pkgs/desktops/plasma-5.4/kgamma5.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support -, qtx11extras -}: - -plasmaPackage { - name = "kgamma5"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kdelibs4support qtx11extras ]; -} diff --git a/pkgs/desktops/plasma-5.4/khelpcenter.nix b/pkgs/desktops/plasma-5.4/khelpcenter.nix deleted file mode 100644 index 6ba860b9dfb26..0000000000000 --- a/pkgs/desktops/plasma-5.4/khelpcenter.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig -, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support -, khtml, kservice, makeQtWrapper -}: - -plasmaPackage { - name = "khelpcenter"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kconfig kcoreaddons kdbusaddons kinit kcmutils kservice - ]; - propagatedBuildInputs = [ kdelibs4support khtml ki18n ]; - postInstall = '' - wrapQtProgram "$out/bin/khelpcenter" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix deleted file mode 100644 index 141320e6b3e69..0000000000000 --- a/pkgs/desktops/plasma-5.4/khotkeys.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils -, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui -, plasma-framework, plasma-workspace, qtx11extras -}: - -plasmaPackage { - name = "khotkeys"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcmutils kdbusaddons kxmlgui - ]; - propagatedBuildInputs = [ - kdelibs4support kglobalaccel ki18n kio plasma-framework - plasma-workspace qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix deleted file mode 100644 index ed717790cd0d8..0000000000000 --- a/pkgs/desktops/plasma-5.4/kinfocenter.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils -, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons -, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage -, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeQtWrapper -, pciutils, solid -}: - -plasmaPackage { - name = "kinfocenter"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kcmutils kcompletion kconfig kconfigwidgets kcoreaddons - kdbusaddons kiconthemes kpackage kservice kwidgetsaddons - kxmlgui libraw1394 pciutils solid - ]; - propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ]; - postInstall = '' - wrapQtProgram "$out/bin/kinfocenter" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix deleted file mode 100644 index 3834ca1328f89..0000000000000 --- a/pkgs/desktops/plasma-5.4/kmenuedit.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui -, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper -}: - -plasmaPackage { - name = "kmenuedit"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kxmlgui kdbusaddons kiconthemes - ]; - propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ]; - postInstall = '' - wrapQtProgram "$out/bin/kmenuedit" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix deleted file mode 100644 index dac7a6ba20a39..0000000000000 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets -, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui -, libkscreen, makeQtWrapper, qtdeclarative -}: - -plasmaPackage { - name = "kscreen"; - nativeBuildInputs = [ - extra-cmake-modules - makeQtWrapper - ]; - buildInputs = [ - kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui - ]; - propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ]; - propagatedUserEnvPkgs = [ - libkscreen # D-Bus service - ]; - postInstall = '' - wrapQtProgram "$out/bin/kscreen-console" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/ksshaskpass.nix b/pkgs/desktops/plasma-5.4/ksshaskpass.nix deleted file mode 100644 index f274512e027a1..0000000000000 --- a/pkgs/desktops/plasma-5.4/ksshaskpass.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons -, ki18n, kwallet, kwidgetsaddons, makeQtWrapper -}: - -plasmaPackage { - name = "ksshaskpass"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ kcoreaddons kwallet kwidgetsaddons ]; - propagatedBuildInputs = [ ki18n ]; - postInstall = '' - wrapQtProgram "$out/bin/ksshaskpass" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/ksysguard.nix b/pkgs/desktops/plasma-5.4/ksysguard.nix deleted file mode 100644 index 7af3584989c30..0000000000000 --- a/pkgs/desktops/plasma-5.4/ksysguard.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig -, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff -, kiconthemes, libksysguard, makeQtWrapper -}: - -plasmaPackage { - name = "ksysguard"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard - ]; - propagatedBuildInputs = [ kdelibs4support ki18n ]; - postInstall = '' - wrapQtProgram "$out/bin/ksysguardd" - wrapQtProgram "$out/bin/ksysguard" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/kwayland.nix b/pkgs/desktops/plasma-5.4/kwayland.nix deleted file mode 100644 index e4d6eb631f957..0000000000000 --- a/pkgs/desktops/plasma-5.4/kwayland.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -, wayland -}: - -plasmaPackage { - name = "kwayland"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - wayland - ]; -} diff --git a/pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 797a32fc5f83a..0000000000000 --- a/pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 78a4b554187c18fd86b62089f7730c4273fadd4c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 07:05:22 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - clients/aurorae/src/aurorae.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp -index 781c960..ad5f420 100644 ---- a/clients/aurorae/src/aurorae.cpp -+++ b/clients/aurorae/src/aurorae.cpp -@@ -211,7 +211,7 @@ void Helper::init() - // so let's try to locate our plugin: - QString pluginPath; - for (const QString &path : m_engine->importPathList()) { -- QDirIterator it(path, QDirIterator::Subdirectories); -+ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - QFileInfo fileInfo = it.fileInfo(); --- -2.5.2 - diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix deleted file mode 100644 index 2ba35807ff861..0000000000000 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy -, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets -, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel -, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications -, kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem -, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative -, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor -, makeQtWrapper -}: - -plasmaPackage { - name = "kwin"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons - kcrash kdecoration kiconthemes kinit knewstuff knotifications - kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE - libSM qtscript udev wayland xcb-util-cursor - ]; - propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem - plasma-framework qtdeclarative qtmultimedia qtx11extras - ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - postInstall = '' - wrapQtProgram "$out/bin/kwin_x11" - wrapQtProgram "$out/bin/kwin_wayland" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/kwrited.nix b/pkgs/desktops/plasma-5.4/kwrited.nix deleted file mode 100644 index a6ed9d9bb2877..0000000000000 --- a/pkgs/desktops/plasma-5.4/kwrited.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty -, knotifications, kdbusaddons -}: - -plasmaPackage { - name = "kwrited"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ]; - propagatedBuildInputs = [ ki18n ]; -} diff --git a/pkgs/desktops/plasma-5.4/libkscreen/default.nix b/pkgs/desktops/plasma-5.4/libkscreen/default.nix deleted file mode 100644 index 9fccbd6834c3e..0000000000000 --- a/pkgs/desktops/plasma-5.4/libkscreen/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -, libXrandr -, qtx11extras -}: - -plasmaPackage { - name = "libkscreen"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libXrandr - ]; - propagatedBuildInputs = [ - qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5.4/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.4/libkscreen/libkscreen-backend-path.patch deleted file mode 100644 index d5797924d2332..0000000000000 --- a/pkgs/desktops/plasma-5.4/libkscreen/libkscreen-backend-path.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 460022f..422a708 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,5 +1,7 @@ - include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES}) - -+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h) -+ - set(libkscreen_SRCS - backendloader.cpp - config.cpp -diff --git a/src/backendloader.cpp b/src/backendloader.cpp -index b93e469..8aebc14 100644 ---- a/src/backendloader.cpp -+++ b/src/backendloader.cpp -@@ -16,6 +16,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - *************************************************************************************/ - -+#include "config-libkscreen.h" - #include "backendloader.h" - #include "debug_p.h" - #include "backends/abstractbackend.h" -@@ -40,55 +41,54 @@ bool BackendLoader::init() - const QString backend = qgetenv("KSCREEN_BACKEND").constData(); - const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend); - -- const QStringList paths = QCoreApplication::libraryPaths(); -- Q_FOREACH (const QString &path, paths) { -- const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), -- backendFilter, -- QDir::SortFlags(QDir::QDir::NoSort), -- QDir::NoDotAndDotDot | QDir::Files); -- const QFileInfoList finfos = dir.entryInfoList(); -- Q_FOREACH (const QFileInfo &finfo, finfos) { -- // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND -- if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { -- continue; -- } -+ QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/"); - -- // When on X11, skip the QScreen backend, instead use the XRandR backend, -- // if not specified in KSCREEN_BACKEND -- if (backend.isEmpty() && -- finfo.fileName().contains(QLatin1String("KSC_QScreen")) && -- QX11Info::isPlatformX11()) { -- continue; -- } -+ const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), -+ backendFilter, -+ QDir::SortFlags(QDir::QDir::NoSort), -+ QDir::NoDotAndDotDot | QDir::Files); -+ const QFileInfoList finfos = dir.entryInfoList(); -+ Q_FOREACH (const QFileInfo &finfo, finfos) { -+ // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND -+ if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { -+ continue; -+ } - -- // When not on X11, skip the XRandR backend, and fall back to QSCreen -- // if not specified in KSCREEN_BACKEND -- if (backend.isEmpty() && -- finfo.fileName().contains(QLatin1String("KSC_XRandR")) && -- !QX11Info::isPlatformX11()) { -- continue; -- } -+ // When on X11, skip the QScreen backend, instead use the XRandR backend, -+ // if not specified in KSCREEN_BACKEND -+ if (backend.isEmpty() && -+ finfo.fileName().contains(QLatin1String("KSC_QScreen")) && -+ QX11Info::isPlatformX11()) { -+ continue; -+ } -+ -+ // When not on X11, skip the XRandR backend, and fall back to QSCreen -+ // if not specified in KSCREEN_BACKEND -+ if (backend.isEmpty() && -+ finfo.fileName().contains(QLatin1String("KSC_XRandR")) && -+ !QX11Info::isPlatformX11()) { -+ continue; -+ } - -- QPluginLoader loader(finfo.filePath()); -- loader.load(); -- QObject *instance = loader.instance(); -- if (!instance) { -+ QPluginLoader loader(finfo.filePath()); -+ loader.load(); -+ QObject *instance = loader.instance(); -+ if (!instance) { -+ loader.unload(); -+ continue; -+ } -+ -+ s_backend = qobject_cast< AbstractBackend* >(instance); -+ if (s_backend) { -+ if (!s_backend->isValid()) { -+ qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; -+ delete s_backend; -+ s_backend = 0; - loader.unload(); - continue; - } -- -- s_backend = qobject_cast< AbstractBackend* >(instance); -- if (s_backend) { -- if (!s_backend->isValid()) { -- qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; -- delete s_backend; -- s_backend = 0; -- loader.unload(); -- continue; -- } -- qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; -- return true; -- } -+ qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; -+ return true; - } - } - -diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake -new file mode 100644 -index 0000000..a99f3d1 ---- /dev/null -+++ b/src/config-libkscreen.h.cmake -@@ -0,0 +1,2 @@ -+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" -+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}" diff --git a/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index fbbb11ae7556b..0000000000000 --- a/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 07:07:22 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - processui/scripting.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/processui/scripting.cpp b/processui/scripting.cpp -index efed8ff..841761a 100644 ---- a/processui/scripting.cpp -+++ b/processui/scripting.cpp -@@ -167,7 +167,7 @@ void Scripting::loadContextMenu() { - QStringList scripts; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "ksysguard/scripts/", QStandardPaths::LocateDirectory); - Q_FOREACH (const QString& dir, dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - scripts.append(it.next()); - } --- -2.5.2 - diff --git a/pkgs/desktops/plasma-5.4/libksysguard/default.nix b/pkgs/desktops/plasma-5.4/libksysguard/default.nix deleted file mode 100644 index 373221b2b3052..0000000000000 --- a/pkgs/desktops/plasma-5.4/libksysguard/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kauth, kcompletion -, kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons -, kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras -, kconfig, ki18n, kiconthemes -}: - -plasmaPackage { - name = "libksysguard"; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kcompletion kconfigwidgets kcoreaddons kservice - kwidgetsaddons qtscript qtwebkit - ]; - propagatedBuildInputs = [ - kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework - qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5.4/milou.nix b/pkgs/desktops/plasma-5.4/milou.nix deleted file mode 100644 index 760de2d79ab4e..0000000000000 --- a/pkgs/desktops/plasma-5.4/milou.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative -, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework -, krunner -}: - -plasmaPackage { - name = "milou"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - qtscript kcoreaddons kservice - ]; - propagatedBuildInputs = [ - kdeclarative ki18n krunner plasma-framework qtdeclarative - ]; -} diff --git a/pkgs/desktops/plasma-5.4/oxygen-fonts.nix b/pkgs/desktops/plasma-5.4/oxygen-fonts.nix deleted file mode 100644 index b1ccb6f5ffd50..0000000000000 --- a/pkgs/desktops/plasma-5.4/oxygen-fonts.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -, fontforge -}: - -plasmaPackage { - name = "oxygen-fonts"; - nativeBuildInputs = [ - extra-cmake-modules - fontforge - ]; -} diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix deleted file mode 100644 index 02918100408ac..0000000000000 --- a/pkgs/desktops/plasma-5.4/oxygen.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig -, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion -, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras -}: - -plasmaPackage { - name = "oxygen"; - nativeBuildInputs = [ - extra-cmake-modules makeQtWrapper - ]; - buildInputs = [ - kcmutils kconfig kdecoration kguiaddons kwidgetsaddons - kservice kcompletion - ]; - propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/oxygen-demo5" - wrapQtProgram "$out/bin/oxygen-settings5" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch deleted file mode 100644 index a0b1f880ba851..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 618d86f35b83ee9e57da12be9d0866e34e487b88 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Fri, 28 Aug 2015 10:16:38 -0500 -Subject: [PATCH 1/3] hwclock - ---- - kcms/dateandtime/helper.cpp | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp -index cec5ab8..fc4a6b9 100644 ---- a/kcms/dateandtime/helper.cpp -+++ b/kcms/dateandtime/helper.cpp -@@ -48,10 +48,6 @@ - #include <sys/stat.h> - #endif - --// We cannot rely on the $PATH environment variable, because D-Bus activation --// clears it. So we have to use a reasonable default. --static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin"); -- - int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled ) - { - int ret = 0; -@@ -227,7 +223,7 @@ int ClockHelper::tzreset() - - void ClockHelper::toHwclock() - { -- QString hwclock = KStandardDirs::findExe("hwclock", exePath); -+ QString hwclock = "@hwclock@"; - if (!hwclock.isEmpty()) { - KProcess::execute(hwclock, QStringList() << "--systohc"); - } --- -2.5.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch deleted file mode 100644 index 900c4d095e878..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch +++ /dev/null @@ -1,30 +0,0 @@ -From decdc77a7e89b6f1bb3d49268b08a43daf4a7147 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Fri, 28 Aug 2015 10:16:53 -0500 -Subject: [PATCH 2/3] zoneinfo - ---- - kcms/dateandtime/helper.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp -index fc4a6b9..7b64d05 100644 ---- a/kcms/dateandtime/helper.cpp -+++ b/kcms/dateandtime/helper.cpp -@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone ) - - val = selectedzone; - #else -- QString tz = "/usr/share/zoneinfo/" + selectedzone; -+ // NixOS-specific path -+ QString tz = "/etc/zoneinfo/" + selectedzone; -+ if (!QFile::exists(tz)) { -+ // Standard Linux path -+ tz = "/usr/share/zoneinfo/" + selectedzone; -+ } - - if (QFile::exists(tz)) { // make sure the new TZ really exists - QFile::remove("/etc/localtime"); --- -2.5.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch deleted file mode 100644 index 6b143bd2eb048..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 4231d70ec08d9bbb367b222d9ef04454c1dc7328 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 19 Oct 2015 18:45:36 -0500 -Subject: [PATCH 3/3] qt-5.5 QML import paths - ---- - applets/pager/package/contents/ui/main.qml | 2 +- - containments/desktop/package/contents/ui/FolderView.qml | 2 +- - containments/desktop/package/contents/ui/main.qml | 2 +- - containments/panel/contents/ui/main.qml | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml -index 0c367c6..c9a82be 100644 ---- a/applets/pager/package/contents/ui/main.qml -+++ b/applets/pager/package/contents/ui/main.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents - import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents - import org.kde.draganddrop 2.0 - import org.kde.plasma.private.pager 2.0 --import "utils.js" as Utils -+import "../code/utils.js" as Utils - - MouseArea { - id: root -diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml -index 578ec87..04e088c 100644 ---- a/containments/desktop/package/contents/ui/FolderView.qml -+++ b/containments/desktop/package/contents/ui/FolderView.qml -@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.kquickcontrolsaddons 2.0 - - import org.kde.private.desktopcontainment.folder 0.1 as Folder --import "FolderTools.js" as FolderTools -+import "../code/FolderTools.js" as FolderTools - - Item { - id: main -diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml -index 8c42706..fc74433 100644 ---- a/containments/desktop/package/contents/ui/main.qml -+++ b/containments/desktop/package/contents/ui/main.qml -@@ -28,7 +28,7 @@ import org.kde.draganddrop 2.0 as DragDrop - - import org.kde.private.desktopcontainment.desktop 0.1 as Desktop - --import "LayoutManager.js" as LayoutManager -+import "../code/LayoutManager.js" as LayoutManager - - DragDrop.DropArea { - id: root -diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml -index 6a6f364..edba48e 100644 ---- a/containments/panel/contents/ui/main.qml -+++ b/containments/panel/contents/ui/main.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents - import org.kde.kquickcontrolsaddons 2.0 - import org.kde.draganddrop 2.0 as DragDrop - --import "LayoutManager.js" as LayoutManager -+import "../code/LayoutManager.js" as LayoutManager - - DragDrop.DropArea { - id: root --- -2.5.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix deleted file mode 100644 index 6aae2e20aaae5..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools -, attica, baloo, boost, fontconfig, kactivities, kauth, kcmutils -, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons -, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications -, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon -, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras -, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev -, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver -, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux -, qtquick1, qtquickcontrols -}: - -plasmaPackage rec { - name = "plasma-desktop"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - attica boost fontconfig kcmutils kdbusaddons kded kitemmodels - knewstuff knotifications knotifyconfig kwallet libcanberra_kde - libXcursor libpulseaudio libXft libxkbfile phonon - qtsvg xf86inputevdev xf86inputsynaptics - xkeyboard_config xinput - ]; - propagatedBuildInputs = [ - baloo kactivities kauth kdeclarative kdelibs4support kemoticons - kglobalaccel ki18n kpeople krunner kwin plasma-framework - plasma-workspace qtdeclarative qtquick1 qtquickcontrols - qtx11extras - ]; - # All propagatedBuildInputs should be present in the profile because - # wrappers cannot be used here. - propagatedUserEnvPkgs = propagatedBuildInputs; - patches = [ - (substituteAll { - src = ./0001-hwclock.patch; - hwclock = "${utillinux}/sbin/hwclock"; - }) - ./0002-zoneinfo.patch - ./0003-qt-5.5-QML-import-paths.patch - ]; - NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ]; - cmakeFlags = [ - "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg" - "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" - ]; - postInstall = '' - wrapQtProgram "$out/bin/kaccess" - wrapQtProgram "$out/bin/solid-action-desktop-gen" - wrapQtProgram "$out/bin/knetattach" - wrapQtProgram "$out/bin/krdb" - wrapQtProgram "$out/bin/kapplymousetheme" - wrapQtProgram "$out/bin/kfontinst" - wrapQtProgram "$out/bin/kcm-touchpad-list-devices" - wrapQtProgram "$out/bin/kfontview" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix deleted file mode 100644 index afd8a18bbbd6a..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, baloo, kactivities, kconfig -, kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice -, kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia -, taglib -}: - -plasmaPackage rec { - name = "plasma-mediacenter"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kconfig kcoreaddons kguiaddons kservice - qtdeclarative qtmultimedia taglib - ]; - propagatedBuildInputs = [ - baloo kactivities kdeclarative kfilemetadata ki18n kio - plasma-framework - ]; - # All propagatedBuildInputs should be present in the profile because - # wrappers cannot be used here. - propagatedUserEnvPkgs = propagatedBuildInputs; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch deleted file mode 100644 index 79b5cfb437e26..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From faf13c97ff1192a201843b9d52f4002dbd9022af Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sun, 25 Oct 2015 09:09:27 -0500 -Subject: [PATCH] mobile-broadband-provider-info path - ---- - libs/editor/mobileproviders.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/editor/mobileproviders.cpp b/libs/editor/mobileproviders.cpp -index 568cb34..98a5992 100644 ---- a/libs/editor/mobileproviders.cpp -+++ b/libs/editor/mobileproviders.cpp -@@ -26,7 +26,7 @@ - - #include <KLocale> - --const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml"; -+const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml"; - - bool localeAwareCompare(const QString & one, const QString & two) { - return one.localeAwareCompare(two) < 0; --- -2.6.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-nm/default.nix b/pkgs/desktops/plasma-5.4/plasma-nm/default.nix deleted file mode 100644 index 7e229d5805248..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-nm/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools -, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative -, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews -, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem -, kxmlgui, makeQtWrapper, mobile_broadband_provider_info -, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework -, qtdeclarative, solid -}: - -plasmaPackage { - name = "plasma-nm"; - patches = [ - (substituteAll { - src = ./0001-mobile-broadband-provider-info-path.patch; - inherit mobile_broadband_provider_info; - }) - ]; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kinit kitemviews knotifications kservice kwallet kwidgetsaddons - kxmlgui mobile_broadband_provider_info modemmanager-qt - networkmanager-qt openconnect solid - ]; - propagatedBuildInputs = [ - kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework - qtdeclarative - ]; - postInstall = '' - wrapQtProgram "$out/bin/kde5-nm-connection-editor" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-pa.nix b/pkgs/desktops/plasma-5.4/plasma-pa.nix deleted file mode 100644 index aef6bfeb67999..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-pa.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, glib, kconfigwidgets -, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio -, plasma-framework -}: - -plasmaPackage { - name = "plasma-pa"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - glib kconfigwidgets kcoreaddons libpulseaudio - ]; - propagatedBuildInputs = [ - kdeclarative kglobalaccel ki18n plasma-framework - ]; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix deleted file mode 100644 index bc87abcad153f..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -}: - -plasmaPackage { - name = "plasma-workspace-wallpapers"; - nativeBuildInputs = [ - extra-cmake-modules - ]; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch deleted file mode 100644 index f66cb6189270f..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch +++ /dev/null @@ -1,401 +0,0 @@ -From 35efc2ce92ed698abb21a79aa6e6670e844ea776 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Thu, 27 Aug 2015 20:36:39 -0500 -Subject: [PATCH 1/2] startkde NixOS patches - ---- - startkde/startkde.cmake | 217 ++++++++++++++++++++---------------------------- - 1 file changed, 88 insertions(+), 129 deletions(-) - -diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 2c4c315..7733721 100644 ---- a/startkde/startkde.cmake -+++ b/startkde/startkde.cmake -@@ -1,8 +1,31 @@ --#!/bin/sh -+#!@bash@/bin/bash - # - # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) - # - -+set -x -+ -+# The KDE icon cache is supposed to update itself -+# automatically, but it uses the timestamp on the icon -+# theme directory as a trigger. Since in Nix the -+# timestamp is always the same, this doesn't work. So as -+# a workaround, nuke the icon cache on login. This isn't -+# perfect, since it may require logging out after -+# installing new applications to update the cache. -+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html -+rm -fv $HOME/.cache/icon-cache.kcache -+ -+# Qt writes a weird ‘libraryPath’ line to -+# ~/.config/Trolltech.conf that causes the KDE plugin -+# paths of previous KDE invocations to be searched. -+# Obviously using mismatching KDE libraries is potentially -+# disastrous, so here we nuke references to the Nix store -+# in Trolltech.conf. A better solution would be to stop -+# Qt from doing this wackiness in the first place. -+if [ -e $HOME/.config/Trolltech.conf ]; then -+ @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf -+fi -+ - if test "x$1" = x--failsafe; then - KDE_FAILSAFE=1 # General failsafe flag - KWIN_COMPOSE=N # Disable KWin's compositing -@@ -16,29 +39,16 @@ trap 'echo GOT SIGHUP' HUP - # we have to unset this for Darwin since it will screw up KDE's dynamic-loading - unset DYLD_FORCE_FLAT_NAMESPACE - --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`qtpaths --binaries-dir` -- qdbus=$qbindir/qdbus -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac --else -- qdbus=qdbus --fi -- - # Check if a KDE session already is running and whether it's possible to connect to X --kcheckrunning -+@out@/bin/kcheckrunning - kcheckrunning_result=$? - if test $kcheckrunning_result -eq 0 ; then -- echo "KDE seems to be already running on this display." -- xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null -+ echo "KDE seems to be already running on this display." -+ @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display." - exit 1 - elif test $kcheckrunning_result -eq 2 ; then - echo "\$DISPLAY is not set or cannot connect to the X server." -- exit 1 -+ exit 1 - fi - - # Boot sequence: -@@ -56,13 +66,8 @@ fi - # * Then ksmserver is started which takes control of the rest of the startup sequence - - # We need to create config folder so we can write startupconfigkeys --if [ ${XDG_CONFIG_HOME} ]; then -- configDir=$XDG_CONFIG_HOME; --else -- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html --fi -- --mkdir -p $configDir -+configDir=$(@qttools@/bin/qtpaths --writable-path GenericConfigLocation) -+mkdir -p "$configDir" - - #This is basically setting defaults so we can use them with kstartupconfig5 - cat >$configDir/startupconfigkeys <<EOF -@@ -101,53 +106,19 @@ XftSubPixel=none - EOF - } - --# Make sure the Oxygen font is installed --# This is necessary for setups where CMAKE_INSTALL_PREFIX --# is not in /usr. fontconfig looks in /usr, ~/.fonts and --# $XDG_DATA_HOME for fonts. In this case, we symlink the --# Oxygen font under ${XDG_DATA_HOME} and make it known to --# fontconfig -- --usr_share="/usr/share" --install_share="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@" -- --if [ ! $install_share = $usr_share ]; then -- -- if [ ${XDG_DATA_HOME} ]; then -- fontsDir="${XDG_DATA_HOME}/fonts" -- else -- fontsDir="${HOME}/.fonts" -- fi -- -- test -d $fontsDir || { -- mkdir -p $fontsDir -- } -- -- oxygenDir=$fontsDir/oxygen -- prefixDir="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/fonts/oxygen" -- -- # if the oxygen dir doesn't exist, create a symlink to be sure that the -- # Oxygen font is available to the user -- test -d $oxygenDir || test -d $prefixDir && { -- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir -- } --fi -- --kstartupconfig5 -+@out@/bin/kstartupconfig5 - returncode=$? - if test $returncode -ne 0; then -- xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." -+ @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." - exit 1 - fi - [ -r $configDir/startupconfig ] && . $configDir/startupconfig - --if test "$kdeglobals_kscreen_scalefactor" -ne 1; then -- export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor --fi -+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/tr "\n" ":") -+export XCURSOR_PATH - - # XCursor mouse theme needs to be applied here to work even for kded or ksmserver - if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then -- @EXPORT_XCURSOR_PATH@ - - kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" - if test $? -eq 10; then -@@ -163,21 +134,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" - fi - fi - --if test "$kcmfonts_general_forcefontdpi" -ne 0; then -- xrdb -quiet -merge -nocpp <<EOF --Xft.dpi: $kcmfonts_general_forcefontdpi --EOF --fi -+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard -+# from some users that they're confused and don't know what to do. This is -+# especially necessary on slow machines, where starting KDE takes one or two -+# minutes until anything appears on the screen. -+# -+# If the user has overwritten fonts, the cursor font may be different now -+# so don't move this up. -+# -+@xsetroot@/bin/xsetroot -cursor_name left_ptr - - dl=$DESKTOP_LOCKED - unset DESKTOP_LOCKED # Don't want it in the environment - -+# Make sure that D-Bus is running -+# D-Bus autolaunch is broken -+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then -+ eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session` -+fi -+if @qttools@/bin/qdbus >/dev/null 2>/dev/null; then -+ : # ok -+else -+ echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 -+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" -+ exit 1 -+fi -+ - ksplash_pid= - if test -z "$dl"; then - # the splashscreen and progress indicator - case "$ksplashrc_ksplash_engine" in - KSplashQML) -- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` -+ ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid` - ;; - None) - ;; -@@ -200,8 +189,7 @@ fi - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --# TODO: Use GenericConfigLocation once we depend on Qt 5.4 --scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` -+scriptpath=$(@qttools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g') - - # Add /env/ to the directory to locate the scripts to be sourced - for prefix in `echo $scriptpath`; do -@@ -231,7 +219,7 @@ usr_odir=$HOME/.fonts/kde-override - usr_fdir=$HOME/.fonts - - if test -n "$KDEDIRS"; then -- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -+ kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'` - sys_odir=$kdedirs_first/share/fonts/override - sys_fdir=$kdedirs_first/share/fonts - else -@@ -244,23 +232,13 @@ fi - # add the user's dirs to the font path, as they might simply have been made - # read-only by the administrator, for whatever reason. - --test -d "$sys_odir" && xset +fp "$sys_odir" --test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") --test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") --test -d "$sys_fdir" && xset fp+ "$sys_fdir" -+test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir" -+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" ) -+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" ) -+test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir" - - # Ask X11 to rebuild its font list. --xset fp rehash -- --# Set a left cursor instead of the standard X11 "X" cursor, since I've heard --# from some users that they're confused and don't know what to do. This is --# especially necessary on slow machines, where starting KDE takes one or two --# minutes until anything appears on the screen. --# --# If the user has overwritten fonts, the cursor font may be different now --# so don't move this up. --# --xsetroot -cursor_name left_ptr -+@xset@/bin/xset fp rehash - - # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap - if test -n "$GS_LIB" ; then -@@ -273,30 +251,6 @@ fi - - echo 'startkde: Starting up...' 1>&2 - --# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. --# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend --# to set it to a list of paths *not* including the KDE prefix if it's not /usr or --# /usr/local. --if test -z "$XDG_DATA_DIRS"; then -- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share" --fi --export XDG_DATA_DIRS -- --# Make sure that D-Bus is running --# D-Bus autolaunch is broken --if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then -- eval `dbus-launch --sh-syntax --exit-with-session` --fi --if $qdbus >/dev/null 2>/dev/null; then -- : # ok --else -- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 -- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" -- exit 1 --fi -- -- - # Mark that full KDE session is running (e.g. Konqueror preloading works only - # with full KDE running). The KDE_FULL_SESSION property can be detected by - # any X client connected to the same X session, even if not launched -@@ -321,11 +275,11 @@ fi - # - KDE_FULL_SESSION=true - export KDE_FULL_SESSION --xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -+@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - - KDE_SESSION_VERSION=5 - export KDE_SESSION_VERSION --xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 -+@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - - KDE_SESSION_UID=`id -ru` - export KDE_SESSION_UID -@@ -335,11 +289,11 @@ export XDG_CURRENT_DESKTOP - - # At this point all the environment is ready, let's send it to kwalletd if running - if test -n "$PAM_KWALLET_LOGIN" ; then -- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN -+ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN - fi - # ...and also to kwalletd5 - if test -n "$PAM_KWALLET5_LOGIN" ; then -- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN -+ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN - fi - - # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -@@ -348,21 +302,26 @@ if test $? -ne 0; then - # Startup error - echo 'startkde: Could not sync environment to dbus.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not sync environment to dbus." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus." - exit 1 - fi - - # We set LD_BIND_NOW to increase the efficiency of kdeinit. - # kdeinit unsets this variable before loading applications. --LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -+LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup - if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." - exit 1 - fi - -+# (NixOS) We run kbuildsycoca5 before starting the user session because things -+# may be missing or moved if they have run nixos-rebuild and it may not be -+# possible for them to start Konsole to run it manually! -+@kservice@/bin/kbuildsycoca5 -+ - # finally, give the session control to the session manager - # see kdebase/ksmserver for the description of the rest of the startup sequence - # if the KDEWM environment variable has been set, then it will be used as KDE's -@@ -378,27 +337,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" - # lock now and do the rest of the KDE startup underneath the locker. - KSMSERVEROPTIONS="" - test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" --kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS -+@kinit@/bin/kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS - if test $? -eq 255; then - # Startup error - echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." - fi - --wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` - - if test x"$wait_drkonqi"x = x"true"x ; then - # wait for remaining drkonqi instances with timeout (in seconds) -- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` -+ wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` - wait_drkonqi_counter=0 -- while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do -+ while @qttools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) - if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then - # ask remaining drkonqis to die in a graceful way -- $qdbus | grep 'org.kde.drkonqi-' | while read address ; do -- $qdbus "$address" "/MainApplication" "quit" -+ @qttools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do -+ @qttools@/bin/qdbus "$address" "/MainApplication" "quit" - done - break - fi -@@ -410,21 +369,21 @@ echo 'startkde: Shutting down...' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - - # Clean up --kdeinit5_shutdown -+@kinit@/bin/kdeinit5_shutdown - - echo 'startkde: Running shutdown scripts...' 1>&2 - - # Run scripts found in <config locations>/plasma-workspace/shutdown - for prefix in `echo "$scriptpath"`; do -- for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do -+ for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do - test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file" - done - done - - unset KDE_FULL_SESSION --xprop -root -remove KDE_FULL_SESSION -+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION --xprop -root -remove KDE_SESSION_VERSION -+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION - unset KDE_SESSION_UID - - echo 'startkde: Done.' 1>&2 --- -2.6.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch deleted file mode 100644 index 7614a2add9d7d..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 033d3560d26ceabbd6da6310d326fec7a473df82 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 19 Oct 2015 18:55:36 -0500 -Subject: [PATCH 2/2] qt-5.5 QML import paths - ---- - applets/analog-clock/contents/ui/analogclock.qml | 2 +- - applets/batterymonitor/package/contents/ui/BatteryItem.qml | 2 +- - applets/batterymonitor/package/contents/ui/CompactRepresentation.qml | 2 +- - applets/batterymonitor/package/contents/ui/PopupDialog.qml | 2 +- - applets/batterymonitor/package/contents/ui/batterymonitor.qml | 2 +- - applets/lock_logout/contents/ui/lockout.qml | 2 +- - applets/notifications/package/contents/ui/main.qml | 2 +- - applets/systemtray/package/contents/ui/main.qml | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/applets/analog-clock/contents/ui/analogclock.qml b/applets/analog-clock/contents/ui/analogclock.qml -index edb3af9..7eb839d 100644 ---- a/applets/analog-clock/contents/ui/analogclock.qml -+++ b/applets/analog-clock/contents/ui/analogclock.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as PlasmaCalendar - import QtQuick.Layouts 1.1 - - import org.kde.plasma.core 2.0 as PlasmaCore --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: analogclock -diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml -index 8d43797..3322369 100644 ---- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml -+++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml -@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents - import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.plasma.workspace.components 2.0 - import org.kde.kcoreaddons 1.0 as KCoreAddons --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: batteryItem -diff --git a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -index b4059cb..ae8eeaf 100755 ---- a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -+++ b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.workspace.components 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - MouseArea { - id: root -diff --git a/applets/batterymonitor/package/contents/ui/PopupDialog.qml b/applets/batterymonitor/package/contents/ui/PopupDialog.qml -index d4952c6..2b6586d 100644 ---- a/applets/batterymonitor/package/contents/ui/PopupDialog.qml -+++ b/applets/batterymonitor/package/contents/ui/PopupDialog.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.kquickcontrolsaddons 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - FocusScope { - id: dialog -diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml -index a086581..6e1e8be 100755 ---- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml -+++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.kcoreaddons 1.0 as KCoreAddons - import org.kde.kquickcontrolsaddons 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: batterymonitor -diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml -index d243796..86475df 100644 ---- a/applets/lock_logout/contents/ui/lockout.qml -+++ b/applets/lock_logout/contents/ui/lockout.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 - import org.kde.kquickcontrolsaddons 2.0 --import "data.js" as Data -+import "../code/data.js" as Data - - Flow { - id: lockout -diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml -index 2871cdb..3f50856 100644 ---- a/applets/notifications/package/contents/ui/main.qml -+++ b/applets/notifications/package/contents/ui/main.qml -@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras - - import org.kde.plasma.private.notifications 1.0 - --import "uiproperties.js" as UiProperties -+import "../code/uiproperties.js" as UiProperties - - MouseEventListener { - id: notificationsApplet -diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml -index 2e26455..864c9c5 100644 ---- a/applets/systemtray/package/contents/ui/main.qml -+++ b/applets/systemtray/package/contents/ui/main.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore - // import org.kde.plasma.extras 2.0 as PlasmaExtras - - import org.kde.private.systemtray 2.0 as SystemTray --import "Layout.js" as LayoutManager -+import "../code/Layout.js" as LayoutManager - - Item { - id: root --- -2.6.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix deleted file mode 100644 index 85f38b24e8cca..0000000000000 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, baloo -, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative -, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime -, kjsembed, knewstuff, knotifyconfig, kpackage, krunner -, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient -, libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt -, pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland -, libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig -, kinit, kservice, makeQtWrapper, qttools, dbus_tools, mkfontdir, xmessage -, xprop, xrdb, xset, xsetroot, solid, qtquickcontrols -}: - -plasmaPackage rec { - name = "plasma-workspace"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff - knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient - libdbusmenu libSM libXcursor networkmanager-qt pam phonon - qtscript wayland - ]; - propagatedBuildInputs = [ - baloo kactivities kdeclarative kdelibs4support kglobalaccel - kidletime krunner ktexteditor kwin libkscreen libksysguard - plasma-framework qtquick1 qtquickcontrols qtx11extras solid - ]; - patches = [ - ./0001-startkde-NixOS-patches.patch - ./0002-qt-5.5-QML-import-paths.patch - ]; - - inherit bash coreutils gnused gnugrep socat; - inherit kconfig kinit kservice qttools; - inherit dbus_tools mkfontdir xmessage xprop xrdb xset xsetroot; - postPatch = '' - substituteAllInPlace startkde/startkde.cmake - substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ - --replace kdostartupconfig5 $out/bin/kdostartupconfig5 - ''; - postInstall = '' - wrapQtProgram "$out/bin/ksmserver" - wrapQtProgram "$out/bin/plasmawindowed" - wrapQtProgram "$out/bin/kcminit_startup" - wrapQtProgram "$out/bin/ksplashqml" - wrapQtProgram "$out/bin/kcheckrunning" - wrapQtProgram "$out/bin/systemmonitor" - wrapQtProgram "$out/bin/kstartupconfig5" - wrapQtProgram "$out/bin/startplasmacompositor" - wrapQtProgram "$out/bin/kdostartupconfig5" - wrapQtProgram "$out/bin/klipper" - wrapQtProgram "$out/bin/kuiserver5" - wrapQtProgram "$out/bin/krunner" - wrapQtProgram "$out/bin/plasmashell" - - wrapQtProgram "$out/lib/libexec/drkonqi" - wrapQtProgram "$out/lib/libexec/kscreenlocker_greet" - rm "$out/lib/libexec/startplasma" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix deleted file mode 100644 index 0173ec655169e..0000000000000 --- a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -, ki18n -, kwindowsystem -, kdbusaddons -, kwidgetsaddons -, kcoreaddons -, kcrash -, kconfig -, kiconthemes -, knotifications -, polkitQt -}: - -plasmaPackage { - name = "polkit-kde-agent"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdbusaddons - kwidgetsaddons - kcoreaddons - kcrash - kconfig - kiconthemes - knotifications - polkitQt - ]; - propagatedBuildInputs = [ ki18n kwindowsystem ]; -} diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix deleted file mode 100644 index 4b57a2e0a798f..0000000000000 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities -, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n -, kidletime, kio, knotifyconfig, libkscreen, plasma-workspace -, qtx11extras, solid, udev -}: - -plasmaPackage { - name = "powerdevil"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kconfig kdbusaddons knotifyconfig solid udev - ]; - propagatedBuildInputs = [ - kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime - libkscreen plasma-workspace qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5.4/setup-hook.sh b/pkgs/desktops/plasma-5.4/setup-hook.sh deleted file mode 100644 index a8d9b7e0e36f4..0000000000000 --- a/pkgs/desktops/plasma-5.4/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/desktops/plasma-5.4/srcs.nix b/pkgs/desktops/plasma-5.4/srcs.nix deleted file mode 100644 index b60a1b2ccd84e..0000000000000 --- a/pkgs/desktops/plasma-5.4/srcs.nix +++ /dev/null @@ -1,301 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - bluedevil = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/bluedevil-5.4.3.tar.xz"; - sha256 = "04zl8sl59imxfmph8igy2xw5qbdqhqbf1f3s92zhrcqghnawyr3k"; - name = "bluedevil-5.4.3.tar.xz"; - }; - }; - breeze = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/breeze-5.4.3.tar.xz"; - sha256 = "1ylkrza65m4irvyfl3nzfsfaf3j0z3q5j5qv7lk16g4crknxb2gw"; - name = "breeze-5.4.3.tar.xz"; - }; - }; - kde-cli-tools = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kde-cli-tools-5.4.3.tar.xz"; - sha256 = "16d7fkxvbr60h96g7faq6c7gzssb43ynac7yhpfp4i2gwx1w9q8r"; - name = "kde-cli-tools-5.4.3.tar.xz"; - }; - }; - kdecoration = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kdecoration-5.4.3.tar.xz"; - sha256 = "1m92spmq0gadcwgwhnf163kh3kzccgw2b62px1v5krk8hlw6q19q"; - name = "kdecoration-5.4.3.tar.xz"; - }; - }; - kde-gtk-config = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kde-gtk-config-5.4.3.tar.xz"; - sha256 = "0apfvcmwzp5g02kx0dvkywrfb7v9gbmlnmyga2jra027zf61jf98"; - name = "kde-gtk-config-5.4.3.tar.xz"; - }; - }; - kdeplasma-addons = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kdeplasma-addons-5.4.3.tar.xz"; - sha256 = "0wyqwrlhm9k2wscbw372mk2v7207jappq59jhzxx223glvz2qrxp"; - name = "kdeplasma-addons-5.4.3.tar.xz"; - }; - }; - kgamma5 = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kgamma5-5.4.3.tar.xz"; - sha256 = "0l6bk008w8m3wiqvk4pdw9s7iln9fbkbi5xl3b8rf846knr478gr"; - name = "kgamma5-5.4.3.tar.xz"; - }; - }; - khelpcenter = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/khelpcenter-5.4.3.tar.xz"; - sha256 = "0kf68maqcm2ym62d6r7v6sw9v91qxzdg53l0hk9h6p7sycs0jqq2"; - name = "khelpcenter-5.4.3.tar.xz"; - }; - }; - khotkeys = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/khotkeys-5.4.3.tar.xz"; - sha256 = "094nsrmnja83rim1cxa5p4rfxx4bdwwsv6b04rvg0l55jvw9wp29"; - name = "khotkeys-5.4.3.tar.xz"; - }; - }; - kinfocenter = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kinfocenter-5.4.3.tar.xz"; - sha256 = "1v6y1div8fhyn93ypnz3a7q6d1mzyabav2bq4rn5rg5hldizjns7"; - name = "kinfocenter-5.4.3.tar.xz"; - }; - }; - kmenuedit = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kmenuedit-5.4.3.tar.xz"; - sha256 = "0zpwvg0xw04jg5kxv9kdmlf6pg1yp6ibzafl8q3ah8ca5n92gb9n"; - name = "kmenuedit-5.4.3.tar.xz"; - }; - }; - kscreen = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kscreen-5.4.3.tar.xz"; - sha256 = "01ba4qqf5vlmsgpf3raq7dgwxvdcm4inc7v03b3z4l7980wa6nxr"; - name = "kscreen-5.4.3.tar.xz"; - }; - }; - ksshaskpass = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/ksshaskpass-5.4.3.tar.xz"; - sha256 = "18r7a49i0rlijjz02h2k2wri3bkhjvzl5as0nv55gkg8b1g05dky"; - name = "ksshaskpass-5.4.3.tar.xz"; - }; - }; - ksysguard = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/ksysguard-5.4.3.tar.xz"; - sha256 = "1lgbvabxfzyl9x1nsmr6nifh24jxnvlknigfrzfcnryibbvk6mlk"; - name = "ksysguard-5.4.3.tar.xz"; - }; - }; - kwallet-pam = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kwallet-pam-5.4.3.tar.xz"; - sha256 = "0m5yz8c6alaw0rkc0dd9cp7jijqmpdmqg4qbc3i3pp5rz3hiyp51"; - name = "kwallet-pam-5.4.3.tar.xz"; - }; - }; - kwayland = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kwayland-5.4.3.tar.xz"; - sha256 = "026jgwyvkfb3zdrama2fi046zxg7v3khvb6sxl1krj4idiiyz1c0"; - name = "kwayland-5.4.3.tar.xz"; - }; - }; - kwayland-integration = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kwayland-integration-5.4.3.tar.xz"; - sha256 = "10acnrv7m12gwd0mccp9j9a47sjl29xrrfwlpqiqh9hcw4vn7mqp"; - name = "kwayland-integration-5.4.3.tar.xz"; - }; - }; - kwin = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kwin-5.4.3.tar.xz"; - sha256 = "0rn359b31hpwqarsw3018r1j7vaavwwxpnnhy29ixsdybmrl4j5b"; - name = "kwin-5.4.3.tar.xz"; - }; - }; - kwrited = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kwrited-5.4.3.tar.xz"; - sha256 = "0irnhvsz6zssq3yb7lf0qy0qimydg78y1ghakpmry8632xgmr0yk"; - name = "kwrited-5.4.3.tar.xz"; - }; - }; - libkscreen = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/libkscreen-5.4.3.tar.xz"; - sha256 = "0xa9g6kvvxn2q3fv0217dk3j4dgbd0mhy8hgrvblpp0fw721faqx"; - name = "libkscreen-5.4.3.tar.xz"; - }; - }; - libksysguard = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/libksysguard-5.4.3.tar.xz"; - sha256 = "18fndkj2bzbwrbixrsq27x4ar379vlsplr3nw766maw31nv5in6i"; - name = "libksysguard-5.4.3.tar.xz"; - }; - }; - milou = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/milou-5.4.3.tar.xz"; - sha256 = "0xy6h1h1ws47rqx5hcn3916xwf49nywwmq32161jap233347yj71"; - name = "milou-5.4.3.tar.xz"; - }; - }; - muon = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/muon-5.4.3.tar.xz"; - sha256 = "011l36ayl0xhap5d7cmkbf4vki8516r594dhxdpfm0ma0rnz4xrl"; - name = "muon-5.4.3.tar.xz"; - }; - }; - oxygen = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/oxygen-5.4.3.tar.xz"; - sha256 = "1av665s2gq84y925qqfhc5bi7wm17vm7p4n10kigsnn5ywylh405"; - name = "oxygen-5.4.3.tar.xz"; - }; - }; - oxygen-fonts = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz"; - sha256 = "13430yajk1i2l9lz95ry9xc1fvzpvfvdp6m9jikb2g55x606abx0"; - name = "oxygen-fonts-5.4.3.tar.xz"; - }; - }; - plasma-desktop = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-desktop-5.4.3.tar.xz"; - sha256 = "0hy08ip6cvcz2s3w1wkqjxdydmmfj5mcqv85qbawsrkix0d79694"; - name = "plasma-desktop-5.4.3.tar.xz"; - }; - }; - plasma-mediacenter = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-mediacenter-5.4.3.tar.xz"; - sha256 = "0k85h93yxqf9ccw620r8wk38gzd8nmpmaxsvwx2rssgnn35f04va"; - name = "plasma-mediacenter-5.4.3.tar.xz"; - }; - }; - plasma-nm = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-nm-5.4.3.tar.xz"; - sha256 = "1wlhzhn7sz26b0ibvwrxbp4pwajvnpj6m37md9bdls3872yhql5r"; - name = "plasma-nm-5.4.3.tar.xz"; - }; - }; - plasma-pa = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-pa-5.4.3.tar.xz"; - sha256 = "16ydbvvpwrnh0ik005gdpvmbn38a1k0bn8zvas1gwjz86rkayxr6"; - name = "plasma-pa-5.4.3.tar.xz"; - }; - }; - plasma-sdk = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-sdk-5.4.3.tar.xz"; - sha256 = "08d31g0364ifc5yix0617zhjyv1skrc9m6x38mx0jjk1z2ng9db8"; - name = "plasma-sdk-5.4.3.tar.xz"; - }; - }; - plasma-workspace = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-workspace-5.4.3.tar.xz"; - sha256 = "030xqy1s8j3h03arjc39xhw2xs9h2c328id6qgaqxk8v9qimkr5z"; - name = "plasma-workspace-5.4.3.tar.xz"; - }; - }; - plasma-workspace-wallpapers = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-workspace-wallpapers-5.4.3.tar.xz"; - sha256 = "12yb9d2b7ynfkmmcc4ciz8cnx482vn9545qrijaa403ba0jfbrhx"; - name = "plasma-workspace-wallpapers-5.4.3.tar.xz"; - }; - }; - polkit-kde-agent = { - version = "1-5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/polkit-kde-agent-1-5.4.3.tar.xz"; - sha256 = "1309wmdrxfqlv621kagwycn2s41n9zsyb56ysqmyilhnb7wq59yn"; - name = "polkit-kde-agent-1-5.4.3.tar.xz"; - }; - }; - powerdevil = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/powerdevil-5.4.3.tar.xz"; - sha256 = "1j20xgca41hqacgsridsigw7s275ad3j0khb59875722qz1y91a0"; - name = "powerdevil-5.4.3.tar.xz"; - }; - }; - sddm-kcm = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/sddm-kcm-5.4.3.tar.xz"; - sha256 = "1ppryl541pjwxi73q1qdcd23kmhga3ajj0j6fws6y8ag4mpg2b6k"; - name = "sddm-kcm-5.4.3.tar.xz"; - }; - }; - systemsettings = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/systemsettings-5.4.3.tar.xz"; - sha256 = "04p455rfxlsp817dqgg907szyfsd0f6ym5kaqaj2g7ys5v8id1vb"; - name = "systemsettings-5.4.3.tar.xz"; - }; - }; - user-manager = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/user-manager-5.4.3.tar.xz"; - sha256 = "0vnfh5q8fgjs40frsb709r7d0py1xgr40air3zysasw25g4bjca8"; - name = "user-manager-5.4.3.tar.xz"; - }; - }; -} diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix deleted file mode 100644 index a921e153dbc2d..0000000000000 --- a/pkgs/desktops/plasma-5.4/systemsettings.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kitemviews -, kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem -, kxmlgui, kdbusaddons, kconfig, khtml, makeQtWrapper -}: - -plasmaPackage { - name = "systemsettings"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons - kconfig - ]; - propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ]; - postInstall = '' - wrapQtProgram "$out/bin/systemsettings5" - ''; -} |