diff options
Diffstat (limited to 'pkgs/desktops/plasma-5/plasma-workspace/default.nix')
-rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/default.nix | 68 |
1 files changed, 22 insertions, 46 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 1403c9e4c8b7..7d6cc10cd4db 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -6,12 +6,12 @@ coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot, - 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, libqalculate, - networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays, - breeze-qt5, + baloo, kactivities, kactivities-stats, kcmutils, kconfig, kcrash, kdbusaddons, + kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, + kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner, kscreenlocker, + ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, + libksysguard, libqalculate, networkmanager-qt, phonon, plasma-framework, + prison, solid, kholidays, breeze-qt5, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtwayland, qtx11extras, @@ -26,53 +26,29 @@ mkDerivation { buildInputs = [ isocodes libdbusmenu libSM libXcursor libXtst pam wayland - 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 libqalculate - networkmanager-qt phonon plasma-framework prison solid kholidays + baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons + kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff + knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor + ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard + libqalculate networkmanager-qt phonon plasma-framework prison solid + kholidays qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras ]; propagatedUserEnvPkgs = [ qtgraphicaleffects ]; outputs = [ "out" "dev" ]; - cmakeFlags = [ - "-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage" - "-DNIXPKGS_MKDIR=${getBin coreutils}/bin/mkdir" - "-DNIXPKGS_XRDB=${getBin xrdb}/bin/xrdb" - "-DNIXPKGS_QTPATHS=${getBin qttools}/bin/qtpaths" - "-DNIXPKGS_XSETROOT=${getBin xsetroot}/bin/xsetroot" - "-DNIXPKGS_XPROP=${getBin xprop}/bin/xprop" - "-DNIXPKGS_ID=${getBin coreutils}/bin/id" - "-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT=${getBin dbus}/bin/dbus-update-activation-environment" - "-DNIXPKGS_START_KDEINIT_WRAPPER=${getLib kinit}/libexec/kf5/start_kdeinit_wrapper" - "-DNIXPKGS_QDBUS=${getBin qttools}/bin/qdbus" - "-DNIXPKGS_KWRAPPER5=${getBin kinit}/bin/kwrapper5" - "-DNIXPKGS_KREADCONFIG5=${getBin kconfig}/bin/kreadconfig5" - "-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, - # - # > git clone https://github.com/ttuegel/plasma-workspace - # > cd plasma-workspace - # > git checkout nixpkgs/$x.$y # where $x.$y.$z == $version - # ... make some commits ... - # > git diff v$x.$y.$z - # - # Add upstream patches to the list below. For new patchs, particularly if not - # submitted upstream, please make a pull request and add it to - # ./plasma-workspace.patch. patches = [ - ./plasma-workspace.patch + ./0001-startkde.patch ]; - preConfigure = '' - NIX_CFLAGS_COMPILE+=" -DNIXPKGS_KDOSTARTUPCONFIG5=\"''${!outputBin}/bin/kdostartupconfig5\"" - cmakeFlags+=" -DNIXPKGS_STARTPLASMA=''${!outputBin}/libexec/startplasma" - ''; + NIX_CFLAGS_COMPILE = [ + ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' + ''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"'' + ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"'' + ''-DNIXPKGS_XPROP="${getBin xprop}/bin/xprop"'' + ''-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT="${getBin dbus}/bin/dbus-update-activation-environment"'' + ''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"'' + ''-DNIXPKGS_KDEINIT5_SHUTDOWN="${getBin kinit}/bin/kdeinit5_shutdown"'' + ]; } |