Fix Synergy building on macOS #43523

Enzime · 2018-07-14T12:38:53Z

Update gtest and gmock to fix clang compiler issues, as well as patch CMakeLists.txt in multiple places to fix other issues on macOS.

Things done

Enzime · 2018-07-14T14:17:40Z

@GrahamcOfBorg build synergy

adisbladis · 2018-07-15T07:20:10Z

pkgs/applications/misc/synergy/default.nix

@@ -14,17 +12,30 @@ stdenv.mkDerivation rec {
    sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3";
  };

-  patches = [ ./openssl-1.1.patch ];
+  patches = [./openssl-1.1.patch ./update_gtest_gmock.patch


Please use fetchpatch to avoid checking in patches to nixpkgs.

If this is a patch I made for Nixpkgs, where should I host it?

My bad. I didn't notice these patches were made by you.
I assumed they were from upstream.

adisbladis · 2018-07-15T07:20:32Z

pkgs/applications/misc/synergy/default.nix


  patch_gcc6 = fetchpatch {
    url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch;
    sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d";
  };

+  gmock_zip = fetchurl {


I don't like this. How are these files supposed to be maintained and updated?
If this is just a temporary measure and expected to be removed in the next release please add a comment stating so.

Added a comment noting that it was only related to this version of Synergy.

adisbladis · 2018-07-15T07:21:34Z

pkgs/applications/misc/synergy/default.nix

    sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
      set(HAVE_X11_EXTENSIONS_XRANDR_H true)
    ' CMakeLists.txt
  '';

+  cmakeFlags = [ "-DOSX_TARGET_MAJOR=10" "-DOSX_TARGET_MINOR=7" ];


These cmake flags should only be applied on darwin.

adisbladis · 2018-07-15T07:22:09Z

cc @aszlig

adisbladis · 2018-07-15T07:25:11Z

@Enzime To use @GrahamcOfBorg you need to be in the whitelist: https://github.com/NixOS/ofborg#trusted-users-vs-known-users

LnL7 · 2018-07-15T16:19:05Z

pkgs/applications/misc/synergy/default.nix

    sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
      set(HAVE_X11_EXTENSIONS_XRANDR_H true)
    ' CMakeLists.txt
  '';

+  cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOSX_TARGET_MAJOR=10" "-DOSX_TARGET_MINOR=7" ];


What's this for? We already set MACOSX_DEPLOYMENT_TARGET in the stdenv.

Synergy's CMakeLists.txt expects these variables, and doesn't infer from MACOSX_DEPLOYMENT_TARGET.

LnL7 · 2018-07-15T16:22:13Z

pkgs/applications/misc/synergy/default.nix

-    cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl
-  ];
+    cmake curl openssl
+  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks;


nit: do this in with callPackage overrides in all-packages.nix

Update gtest and gmock to fix clang compiler issues, as well as patch CMakeLists.txt in multiple places to fix other issues on macOS.

grahamc · 2018-07-17T12:42:52Z

@GrahamcOfBorg build synergy

GrahamcOfBorg · 2018-07-17T12:45:45Z

Success on x86_64-linux (full log)

Attempted: synergy

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/q85h06ac7iba7smyp4mx7jw76nr8fp4m-synergy-1.8.8
shrinking /nix/store/q85h06ac7iba7smyp4mx7jw76nr8fp4m-synergy-1.8.8/bin/synergyc
shrinking /nix/store/q85h06ac7iba7smyp4mx7jw76nr8fp4m-synergy-1.8.8/bin/synergys
shrinking /nix/store/q85h06ac7iba7smyp4mx7jw76nr8fp4m-synergy-1.8.8/bin/synergyd
strip is /nix/store/90vmpr41dzsx350k5argycaf693hnl1l-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/q85h06ac7iba7smyp4mx7jw76nr8fp4m-synergy-1.8.8/bin 
patching script interpreter paths in /nix/store/q85h06ac7iba7smyp4mx7jw76nr8fp4m-synergy-1.8.8
checking for references to /tmp/nix-build-synergy-1.8.8.drv-0 in /nix/store/q85h06ac7iba7smyp4mx7jw76nr8fp4m-synergy-1.8.8...

GrahamcOfBorg · 2018-07-17T12:46:52Z

Success on x86_64-darwin (full log)

Attempted: synergy

Partial log (click to expand)

[----------] 2 tests from ServerArgsParsingTests (0 ms total)

[----------] Global test environment tear-down
[==========] 139 tests from 12 test cases ran. (14 ms total)
[  PASSED  ] 139 tests.
installing
post-installation fixup
strip is /nix/store/8axizw5mf6dx7wip65nbkyrmlkhmjhc5-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/11iybbpfjzm39wlir1l6fpb2b7djid73-synergy-1.8.8/bin
patching script interpreter paths in /nix/store/11iybbpfjzm39wlir1l6fpb2b7djid73-synergy-1.8.8

GrahamcOfBorg · 2018-07-17T12:57:27Z

Success on aarch64-linux (full log)

Attempted: synergy

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/myk6kndhr2ska9s7x25pkhlqbh0w6br0-synergy-1.8.8
shrinking /nix/store/myk6kndhr2ska9s7x25pkhlqbh0w6br0-synergy-1.8.8/bin/synergyd
shrinking /nix/store/myk6kndhr2ska9s7x25pkhlqbh0w6br0-synergy-1.8.8/bin/synergys
shrinking /nix/store/myk6kndhr2ska9s7x25pkhlqbh0w6br0-synergy-1.8.8/bin/synergyc
strip is /nix/store/7iyn7gn33i7xxjgmwf25k20246y6nd9d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/myk6kndhr2ska9s7x25pkhlqbh0w6br0-synergy-1.8.8/bin
patching script interpreter paths in /nix/store/myk6kndhr2ska9s7x25pkhlqbh0w6br0-synergy-1.8.8
checking for references to /build in /nix/store/myk6kndhr2ska9s7x25pkhlqbh0w6br0-synergy-1.8.8...

Enzime force-pushed the fix/synergy-on-darwin branch from 4f0ef0a to 8a56a1a Compare July 14, 2018 12:40

GrahamcOfBorg added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Jul 14, 2018

adisbladis requested changes Jul 15, 2018

View reviewed changes

Enzime force-pushed the fix/synergy-on-darwin branch from 8a56a1a to a40c2d3 Compare July 15, 2018 13:33

GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Jul 15, 2018

LnL7 reviewed Jul 15, 2018

View reviewed changes

Fix Synergy building on macOS

fe69ee8

Update gtest and gmock to fix clang compiler issues, as well as patch CMakeLists.txt in multiple places to fix other issues on macOS.

Enzime force-pushed the fix/synergy-on-darwin branch from a40c2d3 to fe69ee8 Compare July 16, 2018 14:05

LnL7 approved these changes Jul 21, 2018

View reviewed changes

LnL7 merged commit d4943ea into NixOS:master Jul 21, 2018

Enzime deleted the fix/synergy-on-darwin branch July 24, 2018 11:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Synergy building on macOS #43523

Fix Synergy building on macOS #43523

Enzime commented Jul 14, 2018

Enzime commented Jul 14, 2018

adisbladis Jul 15, 2018

Enzime Jul 15, 2018

adisbladis Jul 15, 2018

adisbladis Jul 15, 2018

Enzime Jul 15, 2018

adisbladis Jul 15, 2018

Enzime Jul 15, 2018

adisbladis commented Jul 15, 2018

adisbladis commented Jul 15, 2018

LnL7 Jul 15, 2018

Enzime Jul 15, 2018

LnL7 Jul 15, 2018

Enzime Jul 16, 2018

grahamc commented Jul 17, 2018

GrahamcOfBorg commented Jul 17, 2018

GrahamcOfBorg commented Jul 17, 2018

GrahamcOfBorg commented Jul 17, 2018

Fix Synergy building on macOS #43523

Fix Synergy building on macOS #43523

Conversation

Enzime commented Jul 14, 2018

Things done

Enzime commented Jul 14, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adisbladis commented Jul 15, 2018

adisbladis commented Jul 15, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

grahamc commented Jul 17, 2018

GrahamcOfBorg commented Jul 17, 2018

GrahamcOfBorg commented Jul 17, 2018

GrahamcOfBorg commented Jul 17, 2018