From 18b2a21583fe7c7025f9caec0b4348e203535a0e Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 11 Aug 2015 14:09:26 +0200 Subject: [PATCH] synergy: Fix support for XRandR again. Regression introduced by f91dacdd07731e06cec80b727b28b749e64f60e8. Accidentally thought that it's compiling with XRandR support enabled, because the cmake output said so: Looking for XRRQueryExtension in Xrandr - found Unfortunately, despite this message, the relevant part is: Looking for XRRNotifyEvent - not found So, ea4afb7 still holds true and I've added a small comment to avoid this from happening in the future. Signed-off-by: aszlig --- pkgs/applications/misc/synergy/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 30b0c5d183c6..c010047845fc 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -17,6 +17,23 @@ stdenv.mkDerivation rec { postPatch = '' ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip + '' + # We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt + # it's not able to find it (it's trying to search the store path of libX11 + # instead) and we don't get XRandR support, even though the CMake output + # _seems_ to say so: + # + # Looking for XRRQueryExtension in Xrandr - found + # + # The relevant part however is: + # + # Looking for XRRNotifyEvent - not found + # + # So let's force it: + + optionalString stdenv.isLinux '' + sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \ + set(HAVE_X11_EXTENSIONS_XRANDR_H true) + ' CMakeLists.txt ''; buildInputs = [