Unverified Commit 2640a38c authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #258796 from doronbehar/pkg/syncthingtray 

syncthingtray: 1.4.6 -> 1.4.7
parents 970e26c3 7f492d34

pkgs/applications/misc/syncthingtray/default.nix

+19 −4
Original line number Diff line number Diff line
@@ -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}"