diff options
| author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-06-15 12:50:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-15 12:50:28 +0000 |
| commit | 47066f0776bef7e051d3303dc007724c76d6580a (patch) | |
| tree | 0738a7477d88cb13eb12350f348579475cb65c58 /pkgs/desktops/plasma-5/plasma-workspace/default.nix | |
| parent | bae863ebaed1a560fd6da5cbc40f3e977689fe23 (diff) | |
| parent | 84999e76e0d02412367a1faa30f73a310c48d5f9 (diff) | |
| download | nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar.gz nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar.bz2 nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar.lz nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar.xz nixlib-47066f0776bef7e051d3303dc007724c76d6580a.tar.zst nixlib-47066f0776bef7e051d3303dc007724c76d6580a.zip | |
Merge pull request #40893 from bkchr/plasma_5_13
plasma5: 5.12 -> 5.13
Diffstat (limited to 'pkgs/desktops/plasma-5/plasma-workspace/default.nix')
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 0e98b095e893..ca77989e0331 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -9,8 +9,9 @@ baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, kjsembed, knewstuff, knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets, - kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, - networkmanager-qt, phonon, plasma-framework, prison, solid, + kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate, + networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays, + breeze-qt5, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtwayland, qtx11extras, @@ -28,8 +29,8 @@ mkDerivation { baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets - kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard - networkmanager-qt phonon plasma-framework prison solid + kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate + networkmanager-qt phonon plasma-framework prison solid kholidays qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras ]; @@ -51,6 +52,7 @@ mkDerivation { "-DNIXPKGS_GREP=${getBin gnugrep}/bin/grep" "-DNIXPKGS_KDEINIT5_SHUTDOWN=${getBin kinit}/bin/kdeinit5_shutdown" "-DNIXPKGS_SED=${getBin gnused}/bin/sed" + "-DNIXPKGS_WALLPAPER_INSTALL_DIR=${getBin breeze-qt5}/share/wallpapers/" ]; # To regenerate ./plasma-workspace.patch, |