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

synergy: Build application bundle on Darwin + other fixes (#80354)

Browse Source 
Includes the following fixes for Darwin:
- Build an application bundle
- Don't install the .desktop file and icons
- Get rid of unused cmake variables
- Don't list avahi as a dependency, since it's not used
This commit is contained in:
Kim Lindberger 2020-02-17 20:41:43 +01:00 committed by GitHub
parent 69efb5cd34
commit a2f3ec7a60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/misc/synergy/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, avahi-compat { stdenv, lib, fetchFromGitHub, cmake, openssl
, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver , ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver
, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, openssl , xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat
, withGUI ? true, wrapQtAppsHook }: , withGUI ? true, wrapQtAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -35,20 +35,19 @@ stdenv.mkDerivation rec {
chmod -R +w ext/ chmod -R +w ext/
''; '';
cmakeFlags = lib.optionals stdenv.isDarwin [ cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF";
"-DOSX_TARGET_MAJOR=10"
"-DOSX_TARGET_MINOR=7"
] ++ lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF";
nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook; nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook;
dontWrapQtApps = true; dontWrapQtApps = true;
buildInputs = [ buildInputs = [
openssl avahi-compat openssl
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
ApplicationServices Carbon Cocoa CoreServices ScreenSaver ApplicationServices Carbon Cocoa CoreServices ScreenSaver
] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; ] ++ lib.optionals stdenv.isLinux [
xlibsWrapper libX11 libXi libXtst libXrandr xinput avahi-compat
];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
@ -56,10 +55,15 @@ stdenv.mkDerivation rec {
'' + lib.optionalString withGUI '' '' + lib.optionalString withGUI ''
cp bin/synergy $out/bin/ cp bin/synergy $out/bin/
wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]} wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]}
'' + lib.optionalString stdenv.isLinux ''
mkdir -p $out/share/icons/hicolor/scalable/apps mkdir -p $out/share/icons/hicolor/scalable/apps
cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/ cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/
mkdir -p $out/share/applications mkdir -p $out/share/applications
substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin
'' + lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications/
mv bundle/Synergy.app $out/Applications/
ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS
''; '';
doCheck = true; doCheck = true;