diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-17 10:56:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-05-17 10:56:54 +0000 |
| commit | c1d22074139ab0d048a05b5e5116265d099114d6 (patch) | |
| tree | 97977009422d675f8930f97c309b010481289e72 /nixpkgs/pkgs/applications/misc/zathura | |
| parent | 4dc8afe4fd6b18437150129e0a1ecc23c6a1c0b9 (diff) | |
| parent | bc9df0f66110039e495b6debe3a6cda4a1bb0fed (diff) | |
| download | nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.gz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.bz2 nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.lz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.xz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.zst nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.zip | |
Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed'
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/zathura')
3 files changed, 8 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix index f3258c0c7116..6378cf1c0681 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/core/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix @@ -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/; diff --git a/nixpkgs/pkgs/applications/misc/zathura/default.nix b/nixpkgs/pkgs/applications/misc/zathura/default.nix index dfddfe7d91e1..e3db15ca78d4 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/default.nix @@ -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 diff --git a/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 709c1edb0b83..e2c08a00da20 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -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"; |