about summary refs log tree commit diff
path: root/pkgs/applications/misc/synergy
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-08-28 16:08:48 +0000
committerRobin Gloster <mail@glob.in>2017-08-28 20:16:18 +0200
commit46cb14c8cc2d8fa1a46289d9bc72f721f8cdd715 (patch)
tree0e126a02703f88d0b1298635848435992e9c433a /pkgs/applications/misc/synergy
parent3a18fa412a9a062e0356f9b8cbb30b6a85b3ce26 (diff)
downloadnixlib-46cb14c8cc2d8fa1a46289d9bc72f721f8cdd715.tar
nixlib-46cb14c8cc2d8fa1a46289d9bc72f721f8cdd715.tar.gz
nixlib-46cb14c8cc2d8fa1a46289d9bc72f721f8cdd715.tar.bz2
nixlib-46cb14c8cc2d8fa1a46289d9bc72f721f8cdd715.tar.lz
nixlib-46cb14c8cc2d8fa1a46289d9bc72f721f8cdd715.tar.xz
nixlib-46cb14c8cc2d8fa1a46289d9bc72f721f8cdd715.tar.zst
nixlib-46cb14c8cc2d8fa1a46289d9bc72f721f8cdd715.zip
synergy: fix check with gcc6
Diffstat (limited to 'pkgs/applications/misc/synergy')
-rw-r--r--pkgs/applications/misc/synergy/default.nix6
1 files changed, 6 insertions, 0 deletions
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