Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7ee76676a71
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a41d0304f26
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 10, 2019

  1. zathura: 0.4.1 -> 0.4.3, new features and plugin 

    Update to 0.4.3, compile it with more features and add CB plugin
    @jlesquembre
    jlesquembre committed Mar 10, 2019
    Copy the full SHA
    053d79d View commit details

Commits on Mar 11, 2019

  1. Merge pull request #57291 from jlesquembre/zathura 

    zathura: 0.4.1 -> 0.4.3, new features and plugin
    @7c6f434c
    7c6f434c authored Mar 11, 2019
    Copy the full SHA
    2a41d03 View commit details
Showing with 45 additions and 3 deletions.
  1. +28 −0 pkgs/applications/misc/zathura/cb/default.nix
  2. +14 −3 pkgs/applications/misc/zathura/core/default.nix
  3. +3 −0 pkgs/applications/misc/zathura/default.nix
28 changes: 28 additions & 0 deletions pkgs/applications/misc/zathura/cb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
17 changes: 14 additions & 3 deletions pkgs/applications/misc/zathura/core/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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,23 +12,33 @@ 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
];

buildInputs = [
gtk girara libintl libseccomp
sqlite glib
sqlite glib file librsvg
] ++ optional synctexSupport texlive.bin.core
++ optional stdenv.isDarwin [ gtk-mac-integration ];

3 changes: 3 additions & 0 deletions pkgs/applications/misc/zathura/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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)
];
};