diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index 72fd7d1dac87..76bb4b510fc1 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -1,44 +1,42 @@ { lib, - mkDerivation, + stdenv, + fetchFromGitHub, cmake, + qt6, hunspell, pkg-config, - qttools, - qtbase, - qtsvg, - qtx11extras, - fetchFromGitHub, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "featherpad"; - version = "1.4.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; - rev = "V${version}"; - sha256 = "sha256-8IT/PxLz6BsLHzY5pM0bTlAO0xvfC7/aI7+Gbw2LyME="; + tag = "V${finalAttrs.version}"; + hash = "sha256-uI/XKBBoKsbABQWvTQbqFLStXFeiJI2u0DA+Injxon0="; }; nativeBuildInputs = [ cmake pkg-config - qttools - ]; - buildInputs = [ - hunspell - qtbase - qtsvg - qtx11extras + qt6.qttools + qt6.wrapQtAppsHook ]; - meta = with lib; { + buildInputs = [ + hunspell + qt6.qtbase + qt6.qtsvg + ]; + + meta = { description = "Lightweight Qt5 Plain-Text Editor for Linux"; homepage = "https://github.com/tsujan/FeatherPad"; - platforms = platforms.linux; - maintainers = [ maintainers.flosse ]; - license = licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.flosse ]; + license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff5ca45f8a92..e8433d1111c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3371,7 +3371,7 @@ with pkgs; fcitx5-table-other = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-other.nix { }; - featherpad = qt5.callPackage ../applications/editors/featherpad { }; + featherpad = callPackage ../applications/editors/featherpad { }; ffsend = callPackage ../tools/misc/ffsend { inherit (darwin.apple_sdk.frameworks) Security AppKit;