public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61295 from rvolosatovs/fix/zathura

Browse Source 
Fix Zathura on Darwin
This commit is contained in:
Dmitry Kalinkin 2019-05-13 10:32:59 -04:00 committed by GitHub
commit 2ddcab0d89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/zathura/core/default.nix
View File

@ -32,15 +32,15 @@ stdenv.mkDerivation rec {
] ++ optional synctexSupport "-Dsynctex=enabled"; ] ++ optional synctexSupport "-Dsynctex=enabled";
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx
gettext makeWrapper libxml2 gettext makeWrapper libxml2
]; ] ++ optional stdenv.isLinux appstream-glib;
buildInputs = [ buildInputs = [
gtk girara libintl libseccomp gtk girara libintl sqlite glib file librsvg
sqlite glib file librsvg
] ++ optional synctexSupport texlive.bin.core ] ++ optional synctexSupport texlive.bin.core
++ optional stdenv.isDarwin [ gtk-mac-integration ]; ++ optional stdenv.isLinux libseccomp
++ optional stdenv.isDarwin gtk-mac-integration;
meta = { meta = {
homepage = https://pwmt.org/projects/zathura/; homepage = https://pwmt.org/projects/zathura/;

3
pkgs/applications/misc/zathura/default.nix
View File

@ -1,5 +1,6 @@
{ config, pkgs { 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 }: , synctexSupport ? true }:
let let

4
pkgs/applications/misc/zathura/pdf-mupdf/default.nix
View File

@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
zathura_core girara mupdf cairo zathura_core girara mupdf cairo
] ++ stdenv.lib.optional stdenv.isDarwin [ ] ++ lib.optional stdenv.isDarwin gtk-mac-integration;
gtk-mac-integration
];
PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura";