diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-15 09:59:21 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-16 10:14:47 -0500 |
commit | 512212db36b3a3afec6ae38081028e51927ad3bc (patch) | |
tree | 69ea4df63be9c91ca2d1aabf743ab8cec99db735 /pkgs | |
parent | 888c66f97d592ebb2579527da722843a5e99a5b8 (diff) | |
download | nixlib-512212db36b3a3afec6ae38081028e51927ad3bc.tar nixlib-512212db36b3a3afec6ae38081028e51927ad3bc.tar.gz nixlib-512212db36b3a3afec6ae38081028e51927ad3bc.tar.bz2 nixlib-512212db36b3a3afec6ae38081028e51927ad3bc.tar.lz nixlib-512212db36b3a3afec6ae38081028e51927ad3bc.tar.xz nixlib-512212db36b3a3afec6ae38081028e51927ad3bc.tar.zst nixlib-512212db36b3a3afec6ae38081028e51927ad3bc.zip |
kde5.frameworks: unwrap all frameworks
Diffstat (limited to 'pkgs')
20 files changed, 64 insertions, 156 deletions
diff --git a/pkgs/desktops/kde-5/applications/ark/default.nix b/pkgs/desktops/kde-5/applications/ark/default.nix index 331c8c647ca2..0af13b645e15 100644 --- a/pkgs/desktops/kde-5/applications/ark/default.nix +++ b/pkgs/desktops/kde-5/applications/ark/default.nix @@ -1,44 +1,33 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, karchive -, kconfig -, kcrash -, kdbusaddons -, ki18n -, kiconthemes -, khtml -, kio -, kservice -, kpty -, kwidgetsaddons -, libarchive -, p7zip -, unrar -, unzipNLS -, zip -}: +{ + kdeApp, lib, + + extra-cmake-modules, kdoctools, makeQtWrapper, -let PATH = lib.makeBinPath [ - p7zip unrar unzipNLS zip - ]; -in + karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio, + kservice, kpty, kwidgetsaddons, libarchive, + + # Archive tools + p7zip, unrar, unzipNLS, zip +}: kdeApp { name = "ark"; nativeBuildInputs = [ - extra-cmake-modules - kdoctools + extra-cmake-modules kdoctools makeQtWrapper ]; propagatedBuildInputs = [ khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice kpty kwidgetsaddons libarchive ]; - postInstall = '' - wrapQtProgram "$out/bin/ark" \ - --prefix PATH : "${PATH}" - ''; + postInstall = + let + PATH = lib.makeBinPath [ + p7zip unrar unzipNLS zip + ]; + in '' + wrapQtProgram "$out/bin/ark" \ + --prefix PATH : "${PATH}" + ''; meta = { license = with lib.licenses; [ gpl2 lgpl3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/desktops/kde-5/frameworks/baloo.nix b/pkgs/desktops/kde-5/frameworks/baloo.nix index f676da0f4c84..825a125c8a79 100644 --- a/pkgs/desktops/kde-5/frameworks/baloo.nix +++ b/pkgs/desktops/kde-5/frameworks/baloo.nix @@ -1,22 +1,15 @@ { kdeFramework, lib, extra-cmake-modules, kauth, kconfig , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime -, kio, lmdb, makeQtWrapper, qtbase, solid +, kio, lmdb, qtbase, solid }: kdeFramework { name = "baloo"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio kidletime lmdb qtbase solid ]; - postInstall = '' - wrapQtProgram "$out/bin/baloo_file" - wrapQtProgram "$out/bin/baloo_file_extractor" - wrapQtProgram "$out/bin/balooctl" - wrapQtProgram "$out/bin/baloosearch" - wrapQtProgram "$out/bin/balooshow" - ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/desktops/kde-5/frameworks/kconfig.nix b/pkgs/desktops/kde-5/frameworks/kconfig.nix index e132afe59886..154329d0e98e 100644 --- a/pkgs/desktops/kde-5/frameworks/kconfig.nix +++ b/pkgs/desktops/kde-5/frameworks/kconfig.nix @@ -1,16 +1,9 @@ { kdeFramework, lib , extra-cmake-modules -, makeQtWrapper }: kdeFramework { name = "kconfig"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - postInstall = '' - wrapQtProgram "$out/bin/kreadconfig5" - wrapQtProgram "$out/bin/kwriteconfig5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix index 1e6976113de6..f507abe29916 100644 --- a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix +++ b/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix @@ -1,15 +1,14 @@ { kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig -, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper +, kdoctools, kguiaddons, ki18n, kwidgetsaddons }: kdeFramework { name = "kconfigwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; postInstall = '' moveToOutput "bin/preparetips5" "$dev" - wrapQtProgram "$dev/bin/preparetips5" ''; } diff --git a/pkgs/desktops/kde-5/frameworks/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks/kcoreaddons.nix index 846b187c866c..94b4136df3da 100644 --- a/pkgs/desktops/kde-5/frameworks/kcoreaddons.nix +++ b/pkgs/desktops/kde-5/frameworks/kcoreaddons.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, makeQtWrapper +{ kdeFramework, lib , extra-cmake-modules , shared_mime_info }: @@ -6,9 +6,6 @@ kdeFramework { name = "kcoreaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ shared_mime_info ]; - postInstall = '' - wrapQtProgram "$out/bin/desktoptojson" - ''; } diff --git a/pkgs/desktops/kde-5/frameworks/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks/kdbusaddons.nix index d2ceab31d14b..eadd645fb99a 100644 --- a/pkgs/desktops/kde-5/frameworks/kdbusaddons.nix +++ b/pkgs/desktops/kde-5/frameworks/kdbusaddons.nix @@ -1,17 +1,11 @@ { kdeFramework, lib , extra-cmake-modules -, makeQtWrapper , qtx11extras }: kdeFramework { name = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/kquitapp5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks/kdeclarative.nix index af9a009b82e5..8db1b73c91a7 100644 --- a/pkgs/desktops/kde-5/frameworks/kdeclarative.nix +++ b/pkgs/desktops/kde-5/frameworks/kdeclarative.nix @@ -1,18 +1,15 @@ { kdeFramework, lib, extra-cmake-modules, epoxy, kconfig , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage -, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig +, kwidgetsaddons, kwindowsystem, pkgconfig , qtdeclarative }: kdeFramework { name = "kdeclarative"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage kwidgetsaddons kwindowsystem qtdeclarative ]; - postInstall = '' - wrapQtProgram "$out/bin/kpackagelauncherqml" - ''; } diff --git a/pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix index a99587bbf045..8e17a1a60c8d 100644 --- a/pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix +++ b/pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, makeQtWrapper +{ kdeFramework, lib , extra-cmake-modules , kcompletion , kconfig @@ -18,12 +18,9 @@ kdeFramework { name = "kdesignerplugin"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet ]; - postInstall = '' - wrapQtProgram "$out/bin/kgendesignerplugin" - ''; } diff --git a/pkgs/desktops/kde-5/frameworks/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks/kdoctools/default.nix index 0ed249da9a4c..99fc4c7d023c 100644 --- a/pkgs/desktops/kde-5/frameworks/kdoctools/default.nix +++ b/pkgs/desktops/kde-5/frameworks/kdoctools/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 -, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages +, docbook5_xsl, karchive, ki18n, perl, perlPackages }: kdeFramework { @@ -7,7 +7,7 @@ kdeFramework { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ karchive ki18n ]; - propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ]; + propagatedNativeBuildInputs = [ perl perlPackages.URI ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" diff --git a/pkgs/desktops/kde-5/frameworks/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks/kglobalaccel.nix index 79db990f191c..4743d0b8f1b0 100644 --- a/pkgs/desktops/kde-5/frameworks/kglobalaccel.nix +++ b/pkgs/desktops/kde-5/frameworks/kglobalaccel.nix @@ -5,18 +5,14 @@ , kcrash , kdbusaddons , kwindowsystem -, makeQtWrapper , qtx11extras }: kdeFramework { name = "kglobalaccel"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/kglobalaccel5" - ''; } diff --git a/pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix index 825b15c81774..6102bb0d4b56 100644 --- a/pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix +++ b/pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, makeQtWrapper +, extra-cmake-modules , karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg }: @@ -7,9 +7,6 @@ kdeFramework { name = "kiconthemes"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ]; - postInstall = '' - wrapQtProgram "$out/bin/kiconfinder5" - ''; } diff --git a/pkgs/desktops/kde-5/frameworks/kio/default.nix b/pkgs/desktops/kde-5/frameworks/kio/default.nix index 7e4317a3f099..cb67c8459034 100644 --- a/pkgs/desktops/kde-5/frameworks/kio/default.nix +++ b/pkgs/desktops/kde-5/frameworks/kio/default.nix @@ -3,14 +3,14 @@ , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet -, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper +, kwidgetsaddons, kwindowsystem, kxmlgui , qtscript, qtx11extras, solid }: kdeFramework { name = "kio"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice @@ -18,10 +18,4 @@ kdeFramework { qtx11extras ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - postInstall = '' - wrapQtProgram "$out/bin/kcookiejar5" - wrapQtProgram "$out/bin/ktelnetservice5" - wrapQtProgram "$out/bin/ktrash5" - wrapQtProgram "$out/bin/protocoltojson" - ''; } diff --git a/pkgs/desktops/kde-5/frameworks/kjs.nix b/pkgs/desktops/kde-5/frameworks/kjs.nix index 1a8750ea74fd..abdc15ce8df6 100644 --- a/pkgs/desktops/kde-5/frameworks/kjs.nix +++ b/pkgs/desktops/kde-5/frameworks/kjs.nix @@ -1,14 +1,10 @@ { kdeFramework, lib , extra-cmake-modules , kdoctools -, makeQtWrapper }: kdeFramework { name = "kjs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - postInstall = '' - wrapQtProgram "$out/bin/kjs5" - ''; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kjsembed.nix b/pkgs/desktops/kde-5/frameworks/kjsembed.nix index 7611b8310075..95bc02422f1b 100644 --- a/pkgs/desktops/kde-5/frameworks/kjsembed.nix +++ b/pkgs/desktops/kde-5/frameworks/kjsembed.nix @@ -1,14 +1,10 @@ { kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs -, makeQtWrapper, qtsvg +, qtsvg }: kdeFramework { name = "kjsembed"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ ki18n kjs qtsvg ]; - postInstall = '' - wrapQtProgram "$out/bin/kjscmd5" - wrapQtProgram "$out/bin/kjsconsole" - ''; } diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks/kpackage/default.nix index 874bb380d736..a39a672574bb 100644 --- a/pkgs/desktops/kde-5/frameworks/kpackage/default.nix +++ b/pkgs/desktops/kde-5/frameworks/kpackage/default.nix @@ -5,16 +5,12 @@ , kcoreaddons , kdoctools , ki18n -, makeQtWrapper }: kdeFramework { name = "kpackage"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - postInstall = '' - wrapQtProgram "$out/bin/kpackagetool5" - ''; } diff --git a/pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix index e1a5e8b2339a..a35af2e7fbfd 100644 --- a/pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix +++ b/pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, makeQtWrapper, perl +, extra-cmake-modules, perl , karchive, kconfig, kguiaddons, kiconthemes, kparts , libgit2 , qtscript, qtxmlpatterns @@ -9,7 +9,7 @@ kdeFramework { name = "ktexteditor"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ]; + nativeBuildInputs = [ extra-cmake-modules perl ]; propagatedBuildInputs = [ karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript qtxmlpatterns sonnet diff --git a/pkgs/desktops/kde-5/frameworks/kwallet.nix b/pkgs/desktops/kde-5/frameworks/kwallet.nix index 3bb99df39a7d..f02c6138df77 100644 --- a/pkgs/desktops/kde-5/frameworks/kwallet.nix +++ b/pkgs/desktops/kde-5/frameworks/kwallet.nix @@ -1,18 +1,14 @@ { kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes , knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt -, makeQtWrapper }: +}: kdeFramework { name = "kwallet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes knotifications kservice kwidgetsaddons kwindowsystem libgcrypt ]; - postInstall = '' - wrapQtProgram "$out/bin/kwalletd5" - wrapQtProgram "$out/bin/kwallet-query" - ''; } diff --git a/pkgs/desktops/kde-5/frameworks/plasma-framework.nix b/pkgs/desktops/kde-5/frameworks/plasma-framework.nix index 2a8762c814f3..a41381486538 100644 --- a/pkgs/desktops/kde-5/frameworks/plasma-framework.nix +++ b/pkgs/desktops/kde-5/frameworks/plasma-framework.nix @@ -2,19 +2,16 @@ , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio , knotifications, kpackage, kservice, kwindowsystem, kxmlgui -, makeQtWrapper, qtscript, qtx11extras +, qtscript, qtx11extras }: kdeFramework { name = "plasma-framework"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications kpackage kservice kwindowsystem kxmlgui qtscript qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/plasmapkg2" - ''; } diff --git a/pkgs/desktops/kde-5/frameworks/solid.nix b/pkgs/desktops/kde-5/frameworks/solid.nix index f1db5c35c10a..c4f580fe1c2d 100644 --- a/pkgs/desktops/kde-5/frameworks/solid.nix +++ b/pkgs/desktops/kde-5/frameworks/solid.nix @@ -1,15 +1,11 @@ { kdeFramework, lib , extra-cmake-modules -, makeQtWrapper , qtdeclarative }: kdeFramework { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtdeclarative ]; - postInstall = '' - wrapQtProgram "$out/bin/solid-hardware5" - ''; } diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix index bb65e1af9370..190003ca5c78 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix @@ -1,19 +1,21 @@ -{ plasmaPackage, lib, copyPathsToStore -, extra-cmake-modules, kdoctools -, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative -, kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff -, knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland -, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, phonon -, plasma-framework, qtquickcontrols, qtscript, qtx11extras, solid -, isocodes, libdbusmenu, libSM, libXcursor, pam, wayland +{ + plasmaPackage, lib, copyPathsToStore, + + extra-cmake-modules, kdoctools, + + baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, + kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff, + knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland, + kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, phonon, + plasma-framework, qtquickcontrols, qtscript, qtx11extras, solid, isocodes, + libdbusmenu, libSM, libXcursor, pam, wayland }: plasmaPackage { name = "plasma-workspace"; nativeBuildInputs = [ - extra-cmake-modules - kdoctools + extra-cmake-modules kdoctools ]; buildInputs = [ baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative @@ -37,21 +39,4 @@ plasmaPackage { rm "$out/lib/libexec/startplasma" rm -r "$out/share/wayland-sessions" ''; - - preFixup = '' - wrapQtProgram $out/bin/kcheckrunning - wrapQtProgram $out/bin/kcminit - wrapQtProgram $out/bin/kcminit_startup - wrapQtProgram $out/bin/kdostartupconfig5 - wrapQtProgram $out/bin/klipper - wrapQtProgram $out/bin/krunner - wrapQtProgram $out/bin/ksmserver - wrapQtProgram $out/bin/ksplashqml - wrapQtProgram $out/bin/kstartupconfig5 - wrapQtProgram $out/bin/kuiserver5 - wrapQtProgram $out/bin/plasmashell - wrapQtProgram $out/bin/plasmawindowed - wrapQtProgram $out/bin/systemmonitor - wrapQtProgram $out/bin/xembedsniproxy - ''; } |