diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
| commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
| tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/applications/misc/syncthingtray/default.nix | |
| parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
| parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
| download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip | |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/syncthingtray/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/syncthingtray/default.nix | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index c464fddcc702..93d539b9f42d 100644 --- a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -17,6 +17,8 @@ , plasma-framework , qttools , iconv +, cppunit +, syncthing , webviewSupport ? true , jsSupport ? true , kioPluginSupport ? stdenv.isLinux @@ -31,14 +33,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.4.6"; + version = "1.4.7"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-/HAqO0eVFt4YLGeTbZSZcH2pOojvykukAGTBHZTfKLQ="; + sha256 = "sha256-ddOyAyvFifsdNMbwcMZTyhA+5pvz6/Eu/VoBmdsHi54="; }; buildInputs = [ @@ -58,18 +60,31 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook cmake qttools + # Although these are test dependencies, we add them anyway so that we test + # whether the test units compile. On Darwin we don't run the tests but we + # still build them. + cppunit + syncthing ] ++ lib.optionals plasmoidSupport [ extra-cmake-modules ] ; - # No tests are available by upstream, but we test --help anyway - # Don't test on Darwin because output is .app + # syncthing server seems to hang on darwin, causing tests to fail. + doCheck = !stdenv.isDarwin; + preCheck = '' + export QT_QPA_PLATFORM=offscreen + export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" + ''; + # don't test --help on Darwin because output is .app doInstallCheck = !stdenv.isDarwin; installCheckPhase = '' $out/bin/syncthingtray --help | grep ${finalAttrs.version} ''; cmakeFlags = [ + "-DBUILD_TESTING=ON" + # See https://github.com/Martchus/syncthingtray/issues/208 + "-DEXCLUDE_TESTS_FROM_ALL=OFF" "-DAUTOSTART_EXEC_PATH=${autostartExecPath}" # See https://github.com/Martchus/syncthingtray/issues/42 "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}" |