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: 73265c19c733
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ddcab0d89d7
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on May 11, 2019

  1. zathura: fix darwin builds

    @rvolosatovs
    rvolosatovs committed May 11, 2019
    Copy the full SHA
    a2f3f68 View commit details

  2. zathura: use poppler on Darwin by default

    @rvolosatovs
    Roman Volosatovs authored and rvolosatovs committed May 11, 2019
    Copy the full SHA
    9ddd56a View commit details

  3. zathura: Add a comment about why poppler is used on Darwin

    @rvolosatovs
    rvolosatovs committed May 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4afa4cd View commit details

Commits on May 13, 2019

  1. Merge pull request #61295 from rvolosatovs/fix/zathura 

    Fix Zathura on Darwin
    @veprbl
    veprbl authored May 13, 2019
    Copy the full SHA
    2ddcab0 View commit details
Showing with 8 additions and 9 deletions.
  1. +5 −5 pkgs/applications/misc/zathura/core/default.nix
  2. +2 −1 pkgs/applications/misc/zathura/default.nix
  3. +1 −3 pkgs/applications/misc/zathura/pdf-mupdf/default.nix
10 changes: 5 additions & 5 deletions pkgs/applications/misc/zathura/core/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,15 +32,15 @@ stdenv.mkDerivation rec {
] ++ optional synctexSupport "-Dsynctex=enabled";

nativeBuildInputs = [
meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx
meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx
gettext makeWrapper libxml2
];
] ++ optional stdenv.isLinux appstream-glib;

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

meta = {
homepage = https://pwmt.org/projects/zathura/;
3 changes: 2 additions & 1 deletion pkgs/applications/misc/zathura/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ config, pkgs
, useMupdf ? config.zathura.useMupdf or true
# zathura_pdf_mupdf fails to load _opj_create_decompress at runtime on Darwin (https://github.com/NixOS/nixpkgs/pull/61295#issue-277982980)
, useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin)
, synctexSupport ? true }:

let
4 changes: 1 addition & 3 deletions pkgs/applications/misc/zathura/pdf-mupdf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {

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

PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura";