diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix new file mode 100644 index 000000000000..eb2a0f1c1e14 --- /dev/null +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core +, girara, gettext, libarchive }: + +stdenv.mkDerivation rec { + name = "zathura-cb-${version}"; + version = "0.1.8"; + + src = fetchurl { + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + buildInputs = [ libarchive zathura_core girara ]; + + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + + meta = with lib; { + homepage = https://pwmt.org/projects/zathura-cb/; + description = "A zathura CB plugin"; + longDescription = '' + The zathura-cb plugin adds comic book support to zathura. + ''; + license = licenses.zlib; + platforms = platforms.unix; + maintainers = with maintainers; [ jlesquembre ]; + }; +} diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 4cf05a21636a..f3258c0c7116 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -2,6 +2,7 @@ , appstream-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2 , sqlite, glib, texlive, libintl, libseccomp +, file, librsvg , gtk-mac-integration, synctexSupport ? true }: @@ -11,15 +12,25 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "zathura-core-${version}"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"; - sha256 = "1znr3psqda06xklzj8mn452w908llapcg1rj468jwpg0wzv6pxfn"; + sha256 = "0hgx5x09i6d0z45llzdmh4l348fxh1y102sb1w76f2fp4r21j4ky"; }; outputs = [ "bin" "man" "dev" "out" ]; + # Flag list: + # https://github.com/pwmt/zathura/blob/master/meson_options.txt + mesonFlags = [ + "-Dsqlite=enabled" + "-Dmagic=enabled" + # "-Dseccomp=enabled" + "-Dmanpages=enabled" + "-Dconvert-icon=enabled" + ] ++ optional synctexSupport "-Dsynctex=enabled"; + nativeBuildInputs = [ meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx gettext makeWrapper libxml2 @@ -27,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk girara libintl libseccomp - sqlite glib + sqlite glib file librsvg ] ++ optional synctexSupport texlive.bin.core ++ optional stdenv.isDarwin [ gtk-mac-integration ]; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 315df5639466..dfddfe7d91e1 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -20,10 +20,13 @@ let zathura_ps = callPackage ./ps { }; + zathura_cb = callPackage ./cb { }; + zathuraWrapper = callPackage ./wrapper.nix { plugins = [ zathura_djvu zathura_ps + zathura_cb (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) ]; };