diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-12 18:01:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-12 18:01:00 +0000 |
| commit | 41b9c0a6d9467cece015ffc7016b9e7e73542157 (patch) | |
| tree | a0255ee8b709c013411779692f4536c00089ef16 /pkgs/desktops/plasma-5/plasma-workspace/default.nix | |
| parent | 300eaad172fef6365ffd06d3816c2e6377c46311 (diff) | |
| parent | 79812f80f3a5b04175ab8c500421c6d6186a6a1c (diff) | |
| download | nixlib-41b9c0a6d9467cece015ffc7016b9e7e73542157.tar nixlib-41b9c0a6d9467cece015ffc7016b9e7e73542157.tar.gz nixlib-41b9c0a6d9467cece015ffc7016b9e7e73542157.tar.bz2 nixlib-41b9c0a6d9467cece015ffc7016b9e7e73542157.tar.lz nixlib-41b9c0a6d9467cece015ffc7016b9e7e73542157.tar.xz nixlib-41b9c0a6d9467cece015ffc7016b9e7e73542157.tar.zst nixlib-41b9c0a6d9467cece015ffc7016b9e7e73542157.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/plasma-5/plasma-workspace/default.nix')
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/default.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 1526694581c6..05adf949afa6 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -148,13 +148,6 @@ mkDerivation { patches = [ ./0001-startkde.patch ./0002-absolute-wallpaper-install-dir.patch - - # backport patch fixing a Wayland crash - # FIXME: remove in next release - (fetchpatch { - url = "https://invent.kde.org/plasma/plasma-workspace/-/commit/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.diff"; - hash = "sha256-cHupiD6fKZ7ICFb4AcuUErrA4646sNGxeGiACPs8IHQ="; - }) ]; # QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools |