Merge pull request #43288 from bkchr/systemsettings_desktop

plasma-workspace: Add patch for missing systemmonitor exec line
This commit is contained in:
adisbladis 2018-07-10 23:33:18 +08:00 committed by GitHub
commit 94791ef99c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation, lib, fetchpatch,
extra-cmake-modules, kdoctools,
@ -66,7 +66,13 @@ mkDerivation {
# 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 ];
patches = [
./plasma-workspace.patch
(fetchpatch {
url = "https://github.com/KDE/plasma-workspace/commit/11e570d861858f3b3e2694e5f9ec242d7f9f12b9.patch";
sha256 = "1vk9yacb59k0v5mgbpgmciflca9r0ll4wh1d83ffx2y2v8sqwiv2";
})
];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_KDOSTARTUPCONFIG5=\"''${!outputBin}/bin/kdostartupconfig5\""