diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index dc4569c6fca3..e81edefdfa62 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -7,6 +7,8 @@ , extra-cmake-modules , cpp-utilities , qtutilities +, qtforkawesome +, boost , cmake , kio , plasma-framework @@ -19,17 +21,23 @@ }: mkDerivation rec { - version = "1.1.3"; + version = "1.1.20"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-ovit2XSkxSjcbpqQUv8IzMqfsfItbtXLbx0/Vy0+J0Y="; + sha256 = "sha256-T0ddAROwVSh+IKGZZNDMC7YB2IfQZal2pAQ5ArirtjI="; }; - buildInputs = [ qtbase cpp-utilities qtutilities ] + buildInputs = [ + qtbase + cpp-utilities + qtutilities + boost + qtforkawesome + ] ++ lib.optionals webviewSupport [ qtwebengine ] ++ lib.optionals jsSupport [ qtdeclarative ] ++ lib.optionals kioPluginSupport [ kio ] diff --git a/pkgs/development/libraries/qtforkawesome/default.nix b/pkgs/development/libraries/qtforkawesome/default.nix new file mode 100644 index 000000000000..03579e024c6c --- /dev/null +++ b/pkgs/development/libraries/qtforkawesome/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, cpp-utilities +, qtutilities +, qttools +, qtbase +, cmake +, perl +}: + +let + fork_awesome_release = fetchFromGitHub { + owner = "ForkAwesome"; + repo = "Fork-Awesome"; + rev = "1.2.0"; + sha256 = "sha256-zG6/0dWjU7/y/oDZuSEv+54Mchng64LVyV8bluskYzc="; + }; +in stdenv.mkDerivation rec { + pname = "qtforkawesome"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "Martchus"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-J3F+ikz6gQqV+JsOX8EpMOWoTmI6UK5KndFALUo4oiU="; + }; + + buildInputs = [ + qtbase + cpp-utilities + qtutilities + ]; + nativeBuildInputs = [ + cmake + qttools + perl + perl.pkgs.YAML + ]; + cmakeFlags = [ + "-DFORK_AWESOME_FONT_FILE=${fork_awesome_release}/fonts/forkawesome-webfont.woff2" + "-DFORK_AWESOME_ICON_DEFINITIONS=${fork_awesome_release}/src/icons/icons.yml" + ]; + + dontWrapQtApps = true; + + meta = with lib; { + homepage = "https://github.com/Martchus/qtforkawesome"; + description = "Library that bundles ForkAwesome for use within Qt applications"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 270766f36511..d4c155d714ff 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -197,6 +197,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qtfeedback = callPackage ../development/libraries/qtfeedback { }; + qtforkawesome = callPackage ../development/libraries/qtforkawesome { }; + qtutilities = callPackage ../development/libraries/qtutilities { }; qtinstaller = callPackage ../development/libraries/qtinstaller { };