diff options
| author | Bastian Köcher <git@kchr.de> | 2018-07-10 16:53:12 +0200 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2018-07-10 16:53:12 +0200 |
| commit | bdc1e3a01a2ade3d2fbc0d52c19bcf241a362984 (patch) | |
| tree | e34fc84bc26eb63f452dedd0ff198e80ab8915b7 /pkgs/desktops | |
| parent | 81c18c1b07f11cddde3e969b0f2dece53c6d2d6b (diff) | |
| download | nixlib-bdc1e3a01a2ade3d2fbc0d52c19bcf241a362984.tar nixlib-bdc1e3a01a2ade3d2fbc0d52c19bcf241a362984.tar.gz nixlib-bdc1e3a01a2ade3d2fbc0d52c19bcf241a362984.tar.bz2 nixlib-bdc1e3a01a2ade3d2fbc0d52c19bcf241a362984.tar.lz nixlib-bdc1e3a01a2ade3d2fbc0d52c19bcf241a362984.tar.xz nixlib-bdc1e3a01a2ade3d2fbc0d52c19bcf241a362984.tar.zst nixlib-bdc1e3a01a2ade3d2fbc0d52c19bcf241a362984.zip | |
plasma-workspace: Add patch for missing systemmonitor exec line
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index ca77989e0331..ab011576b2b7 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -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\"" |