From ef310fc7cd755af8856af8fcbe7bbe1c08b3bc90 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 15 Sep 2021 00:06:39 +0300 Subject: [PATCH] plasma-desktop: add missing dependency xf86inputlibinput for mouse settings fixes https://github.com/NixOS/nixpkgs/issues/132890 --- pkgs/desktops/plasma-5/plasma-desktop/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 37134f240dc3..c46b7d1bd71b 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kdoctools, boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, @@ -21,7 +21,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver - libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config + libxkbfile phonon xf86inputlibinput xf86inputevdev xf86inputsynaptics xinput + xkeyboard_config accounts-qt qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras @@ -35,6 +36,11 @@ mkDerivation { patches = [ ./hwclock-path.patch ./tzdir.patch + # https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/563 + (fetchpatch { + url = "https://invent.kde.org/plasma/plasma-desktop/-/commit/8d9bf2032b8a2e5de75edf5713c42866f5b80649.patch"; + sha256 = "sha256-2jqqFjBljbhf7I+fTsIvuFs3Ic662KTKRnbcSm5Jing="; + }) ]; postPatch = '' sed '1i#include ' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp