From 09481d065e653b7e228e36af1190002cd4ab46dc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 14:57:41 +0000 Subject: [PATCH] syncthingtray: 1.1.2 -> 1.1.3 Move cmake-extra-modules to `nativeBuildInputs`. --- pkgs/applications/misc/syncthingtray/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 2a395a227ba6..dc4569c6fca3 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -19,24 +19,29 @@ }: mkDerivation rec { - version = "1.1.2"; + version = "1.1.3"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-I5QhnYp4ga3ERJ3w4qjh5gFFU+S1Htw26vHK/2M8j5s="; + sha256 = "sha256-ovit2XSkxSjcbpqQUv8IzMqfsfItbtXLbx0/Vy0+J0Y="; }; buildInputs = [ qtbase cpp-utilities qtutilities ] ++ lib.optionals webviewSupport [ qtwebengine ] ++ lib.optionals jsSupport [ qtdeclarative ] ++ lib.optionals kioPluginSupport [ kio ] - ++ lib.optionals plasmoidSupport [ extra-cmake-modules plasma-framework ] + ++ lib.optionals plasmoidSupport [ plasma-framework ] ; - nativeBuildInputs = [ cmake qttools ]; + nativeBuildInputs = [ + cmake + qttools + ] + ++ lib.optionals plasmoidSupport [ extra-cmake-modules ] + ; # No tests are available by upstream, but we test --help anyway doInstallCheck = true; @@ -56,7 +61,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://github.com/Martchus/syncthingtray"; description = "Tray application and Dolphin/Plasma integration for Syncthing"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; };