diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix index fc2d43bb2fb2..d090520684db 100644 --- a/pkgs/applications/office/PageEdit/default.nix +++ b/pkgs/applications/office/PageEdit/default.nix @@ -9,15 +9,15 @@ qttools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pageedit"; - version = "2.0.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Sigil-Ebook"; - repo = pname; - rev = version; - hash = "sha256-zwOSt1eyvuuqfQ1G2bCB4yj6GgixFRc2FLOgcCrdg3Q="; + repo = "pageedit"; + tag = finalAttrs.version; + hash = "sha256-BsK+agn8O2WeftiEHfT5B1hzsP5Av4DkIZqVKoQxb70="; }; nativeBuildInputs = [ @@ -25,10 +25,12 @@ stdenv.mkDerivation rec { wrapQtAppsHook qttools ]; + propagatedBuildInputs = [ qtsvg qtwebengine ]; + cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ]; installPhase = @@ -45,12 +47,12 @@ stdenv.mkDerivation rec { else null; - meta = with lib; { + meta = { description = "ePub XHTML Visual Editor"; mainProgram = "pageedit"; homepage = "https://sigil-ebook.com/pageedit/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.pasqui23 ]; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.pasqui23 ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1719cf98dbf1..3155029ea208 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4085,7 +4085,7 @@ with pkgs; padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { }; - pageedit = libsForQt5.callPackage ../applications/office/PageEdit { }; + pageedit = qt6Packages.callPackage ../applications/office/PageEdit { }; pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };