From 46cb14c8cc2d8fa1a46289d9bc72f721f8cdd715 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 28 Aug 2017 16:08:48 +0000 Subject: synergy: fix check with gcc6 --- pkgs/applications/misc/synergy/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/applications/misc/synergy') diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 89d493bcd016..3ecc772feaa3 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -16,9 +16,15 @@ stdenv.mkDerivation rec { patches = [ ./openssl-1.1.patch ]; + patch_gcc6 = fetchpatch { + url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch; + sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d"; + }; + 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 + patch -d ext/gmock-1.6.0 -p1 -i ${patch_gcc6} '' # 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 -- cgit 1.4.1