public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kwin-5.2: fix build by upstream patch 

CC: @ttuegel.
This commit is contained in:
Vladimír Čunát 2015-02-14 14:16:49 +01:00
parent e82e14ef60
commit 54b4e92574
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/plasma-5.2/default.nix
View File

@ -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 // {

25
pkgs/desktops/plasma-5.2/kwin/libinput-0.8.patch Normal file
View File

@ -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()