diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-02-14 14:16:49 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-02-14 14:18:11 +0100 |
| commit | 54b4e925740614a5d3fa5459f099e870c0712269 (patch) | |
| tree | 912ee5ff04352361d2edd6c1840df80c82983c64 | |
| parent | e82e14ef607298dc276b378bea587d1d6480d3cd (diff) | |
| download | nixlib-54b4e925740614a5d3fa5459f099e870c0712269.tar nixlib-54b4e925740614a5d3fa5459f099e870c0712269.tar.gz nixlib-54b4e925740614a5d3fa5459f099e870c0712269.tar.bz2 nixlib-54b4e925740614a5d3fa5459f099e870c0712269.tar.lz nixlib-54b4e925740614a5d3fa5459f099e870c0712269.tar.xz nixlib-54b4e925740614a5d3fa5459f099e870c0712269.tar.zst nixlib-54b4e925740614a5d3fa5459f099e870c0712269.zip | |
kwin-5.2: fix build by upstream patch
CC: @ttuegel.
| -rw-r--r-- | pkgs/desktops/plasma-5.2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5.2/kwin/libinput-0.8.patch | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix index 4646fda268d9..f647d2c553b1 100644 --- a/pkgs/desktops/plasma-5.2/default.nix +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -108,7 +108,7 @@ let kwin = with pkgs; super.kwin // { buildInputs = with xlibs; super.kwin.buildInputs ++ [ libICE libSM libXcursor ]; - patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ]; + patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ./kwin/libinput-0.8.patch ]; }; libkscreen = with pkgs; super.libkscreen // { diff --git a/pkgs/desktops/plasma-5.2/kwin/libinput-0.8.patch b/pkgs/desktops/plasma-5.2/kwin/libinput-0.8.patch new file mode 100644 index 000000000000..d0b9658b3bfc --- /dev/null +++ b/pkgs/desktops/plasma-5.2/kwin/libinput-0.8.patch @@ -0,0 +1,25 @@ +commit a93a2ab1918630c6d571b5a24379c15a0458d1fa +Author: Martin Gräßlin <mgraesslin@kde.org> +Date: Wed Jan 28 16:20:57 2015 +0100 + + Disable libinput integration if >= 0.8 is found + + libinput 0.8 is incompatible causing the build to fail. As we are in + dependency freeze the only option is to disable the build. + + BUG: 342893 + FIXED-IN: 5.2.1 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 550ef57..8d9c593 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES URL "http://www.freedesktop.org/software + PURPOSE "Required for input handling on Wayland." + ) + set(HAVE_INPUT FALSE) +-if (Libinput_FOUND AND UDEV_FOUND) ++if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8) + set(HAVE_INPUT TRUE) + endif() + |