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: f53113e56c34
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e9b71f0e197
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 13, 2020

  1. zathura: 0.4.5 -> 0.4.7

    Jonathan Ringer committed Nov 13, 2020
    Copy the full SHA
    c62f947 View commit details

  2. zathura-pdf-mupdf: 0.3.5 -> 0.3.6, fix linking

    Jonathan Ringer committed Nov 13, 2020
    Copy the full SHA
    6e9b71f View commit details
Showing with 30 additions and 14 deletions.
  1. +2 −2 pkgs/applications/misc/zathura/core/default.nix
  2. +28 −12 pkgs/applications/misc/zathura/pdf-mupdf/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/zathura/core/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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" ];
40 changes: 28 additions & 12 deletions pkgs/applications/misc/zathura/pdf-mupdf/default.nix
View file
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; {