diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix b/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix index c650f4ef83df..36f0da9e9611 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,8 +1,8 @@ { - mkDerivation, lib, fetchpatch, - extra-cmake-modules, kdoctools, + mkDerivation, lib, + extra-cmake-modules, kdoctools, fetchpatch, - epoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa, + libepoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa, pipewire, udev, wayland, xcb-util-cursor, xwayland, qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors, @@ -12,7 +12,7 @@ kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, krunner, kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, - kwindowsystem, kxmlgui, plasma-framework, + kwindowsystem, kxmlgui, plasma-framework, libqaccessibilityclient, }: # TODO (ttuegel): investigate qmlplugindump failure @@ -21,7 +21,7 @@ mkDerivation { name = "kwin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - epoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire + libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire udev wayland xcb-util-cursor xwayland qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors @@ -31,26 +31,23 @@ mkDerivation { kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage krunner kscreenlocker kservice kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui - plasma-framework + plasma-framework libqaccessibilityclient ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; patches = [ ./0001-follow-symlinks.patch ./0002-xwayland.patch ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch - # Fix build against libglvnd 1.3.4+ - # Remove with release 5.22.90 + # Pass special environments through arguemnts to `kwin_wayland`, bypassing + # ld.so(8) environment stripping due to `kwin_wayland`'s capabilities. + # We need this to have `TZDIR` correctly set for `plasmashell`, or + # everything related to timezone, like clock widgets, will be broken. + # https://invent.kde.org/plasma/kwin/-/merge_requests/1590 (fetchpatch { - url = "https://invent.kde.org/plasma/kwin/-/commit/839710201c389b7f4ed248cb3818e755a37ce977.patch"; - sha256 = "09rldhy0sbmqdfpyjzwm20cwnmrmj0w2751vyi5xlr414g0rzyc1"; - }) - # Fixup previous patch for i686 - # Remove with release 5.22.90 - (fetchpatch { - url = "https://invent.kde.org/plasma/kwin/-/commit/38e24ecd6416a975db0989c21b70d6a4cc242f35.patch"; - sha256 = "0zsjmzswcnvfd2jm1c8i9aijpbap1141mjv6y4j282bplyqlp966"; + url = "https://invent.kde.org/plasma/kwin/-/commit/9a008b223ad696db3bf5692750f2b74e578e08b8.diff"; + sha256 = "sha256-f35G+g2MVABLDbAkCed3ZmtDWrzYn1rdD08mEx35j4k="; }) ]; CXXFLAGS = [ |