Skip to content

zathura: 0.4.5 -> 0.4.7 #103727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonringer merged 2 commits into from
Nov 13, 2020
Merged

zathura: 0.4.5 -> 0.4.7 #103727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c3f70c
zathura: 0.4.5 -> 0.4.7
jonringer Nov 13, 2020
2606a28
zathura-pdf-mupdf: 0.3.5 -> 0.3.6, fix linking
jonringer Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/misc/zathura/core/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "zathura";
version = "0.4.5";
version = "0.4.7";

src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
sha256 = "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c";
sha256 = "1rx1fk9s556fk59lmqgvhwrmv71ashh89bx9adjq46wq5gzdn4p0";
};

outputs = [ "bin" "man" "dev" "out" ];
Expand Down
40 changes: 28 additions & 12 deletions pkgs/applications/misc/zathura/pdf-mupdf/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,45 @@
{ stdenv, lib, meson, ninja, fetchurl, fetchpatch
, pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }:
, cairo
, girara
, gtk-mac-integration
, gumbo
, jbig2dec
, libjpeg
, mupdf
, openjpeg_2
, pkgconfig
, zathura_core
}:

stdenv.mkDerivation rec {
version = "0.3.5";
version = "0.3.6";
pname = "zathura-pdf-mupdf";

src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq";
sha256 = "1r3v37k9fl2rxipvacgxr36llywvy7n20a25h3ajlyk70697sa66";
};

patches = [
# compatibility with MuPDF 1.17
(fetchpatch {
url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/commit/c7f341addb76d5e6fd8c24c666d8fe97c451a4cb.patch";
sha256 = "12rikx2j7dpngfma9x4i504w58a8xx3rc0gmyz183v19hn54c075";
})
];

nativeBuildInputs = [ meson ninja pkgconfig ];

buildInputs = [
zathura_core girara mupdf cairo
cairo
girara
gumbo
jbig2dec
libjpeg
mupdf
openjpeg_2
zathura_core
] ++ lib.optional stdenv.isDarwin gtk-mac-integration;

mesonFlags = [
"-Dlink-external=true"
];

# avoid: undefined symbol: gumbo_destroy_output
NIX_LDFLAGS = [ "-lgumbo" ];

PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura";

meta = with lib; {
Expand Down