diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index e98e3bdbfa6f..609bd81e40e4 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -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} ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fc9248b519a8..e4d03b291663 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87916f7f9666..f95cc9b1f393 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;