summary refs log tree commit diff
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2023-08-10 12:49:16 +0300
committerK900 <me@0upti.me>2023-08-10 12:49:16 +0300
commit4b19c9e327f9817c284e803bef3d35da2efbd445 (patch)
treef99b59b3ee443b63c031bd7e9df3cd4dc8560dab
parentce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e (diff)
downloadnixpkgs-4b19c9e327f9817c284e803bef3d35da2efbd445.tar
nixpkgs-4b19c9e327f9817c284e803bef3d35da2efbd445.tar.gz
nixpkgs-4b19c9e327f9817c284e803bef3d35da2efbd445.tar.bz2
nixpkgs-4b19c9e327f9817c284e803bef3d35da2efbd445.tar.lz
nixpkgs-4b19c9e327f9817c284e803bef3d35da2efbd445.tar.xz
nixpkgs-4b19c9e327f9817c284e803bef3d35da2efbd445.tar.zst
nixpkgs-4b19c9e327f9817c284e803bef3d35da2efbd445.zip
plasma-workspace: backport fix recommended by upstream
See https://mail.kde.org/pipermail/distributions/2023-August/001396.html
-rw-r--r--pkgs/desktops/plasma-5/plasma-workspace/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 7cc61535566..1526694581c 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -65,6 +65,7 @@
 , polkit-qt
 , pipewire
 , libdrm
+, fetchpatch
 }:
 
 let inherit (lib) getBin getLib; in
@@ -147,6 +148,13 @@ 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