diff options
| author | adisbladis <adisbladis@gmail.com> | 2018-07-10 23:33:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 23:33:18 +0800 |
| commit | 94791ef99ca2f113e0143737104ab85a5bc6d0d9 (patch) | |
| tree | 450ce6d77a7c9e435871c526596b6dd267fe6775 /pkgs | |
| parent | 2f4f631b6a9d004fb801fea065a508cdd0eebce7 (diff) | |
| parent | bdc1e3a01a2ade3d2fbc0d52c19bcf241a362984 (diff) | |
| download | nixlib-94791ef99ca2f113e0143737104ab85a5bc6d0d9.tar nixlib-94791ef99ca2f113e0143737104ab85a5bc6d0d9.tar.gz nixlib-94791ef99ca2f113e0143737104ab85a5bc6d0d9.tar.bz2 nixlib-94791ef99ca2f113e0143737104ab85a5bc6d0d9.tar.lz nixlib-94791ef99ca2f113e0143737104ab85a5bc6d0d9.tar.xz nixlib-94791ef99ca2f113e0143737104ab85a5bc6d0d9.tar.zst nixlib-94791ef99ca2f113e0143737104ab85a5bc6d0d9.zip | |
Merge pull request #43288 from bkchr/systemsettings_desktop
plasma-workspace: Add patch for missing systemmonitor exec line
Diffstat (limited to 'pkgs')
| -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\"" |