mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #248324 from K900/plasma-crash-backport
plasma-workspace: backport fix recommended by upstream
This commit is contained in:
commit
9271b60711
1 changed files with 8 additions and 0 deletions
|
@ -65,6 +65,7 @@
|
||||||
, polkit-qt
|
, polkit-qt
|
||||||
, pipewire
|
, pipewire
|
||||||
, libdrm
|
, libdrm
|
||||||
|
, fetchpatch
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let inherit (lib) getBin getLib; in
|
let inherit (lib) getBin getLib; in
|
||||||
|
@ -147,6 +148,13 @@ mkDerivation {
|
||||||
patches = [
|
patches = [
|
||||||
./0001-startkde.patch
|
./0001-startkde.patch
|
||||||
./0002-absolute-wallpaper-install-dir.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
|
# QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools
|
||||||
|
|
Loading…
Reference in a new issue