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

Merge pull request #293766 from davidkna/patch-4

Browse Source 
syncthingtray: install app bundle in `/Applications`
This commit is contained in:
Doron Behar 2024-03-07 22:12:28 +02:00 committed by GitHub
commit 3deaab7643
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/misc/syncthingtray/default.nix
View File

@ -76,8 +76,13 @@ stdenv.mkDerivation (finalAttrs: {
export QT_QPA_PLATFORM=offscreen
export QT_PLUGIN_PATH="${lib.getBin qtbase}/${qtbase.qtPluginPrefix}"
'';
# don't test --help on Darwin because output is .app
doInstallCheck = !stdenv.isDarwin;
postInstall = lib.optionalString stdenv.isDarwin ''
# put the app bundle into the proper place /Applications instead of /bin
mkdir -p $out/Applications
mv $out/bin/syncthingtray.app $out/Applications
# Make binary available in PATH like on other platforms
ln -s $out/Applications/syncthingtray.app/Contents/MacOS/syncthingtray $out/bin/syncthingtray
'';
installCheckPhase = ''
$out/bin/syncthingtray --help | grep ${finalAttrs.version}
'';

1
pkgs/top-level/aliases.nix
View File

@ -1098,6 +1098,7 @@ mapAliases ({
swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06
swtpm-tpm2 = swtpm; # Added 2021-02-26
syncthing-cli = syncthing; # Added 2021-04-06
syncthingtray-qt6 = syncthingtray; # Added 2024-03-06
### T ###

11
pkgs/top-level/all-packages.nix
View File

@ -35235,18 +35235,17 @@ with pkgs;
syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
syncthingtray = libsForQt5.callPackage ../applications/misc/syncthingtray { };
syncthingtray-minimal = libsForQt5.callPackage ../applications/misc/syncthingtray {
syncthingtray = kdePackages.callPackage ../applications/misc/syncthingtray {
# renamed in KF5 -> KF6
plasma-framework = kdePackages.libplasma;
};
syncthingtray-minimal = syncthingtray.override {
webviewSupport = false;
jsSupport = false;
kioPluginSupport = false;
plasmoidSupport = false;
systemdSupport = true;
};
syncthingtray-qt6 = kdePackages.callPackage ../applications/misc/syncthingtray {
# renamed in KF5 -> KF6
plasma-framework = kdePackages.libplasma;
};
synergy = libsForQt5.callPackage ../applications/misc/synergy {
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;