diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-05-13 10:32:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-13 10:32:59 -0400 |
| commit | 2ddcab0d89d7913dfb1001a102d7f6a45143e1d7 (patch) | |
| tree | 10d40b70050fd9540486b3b084395a7243192a75 /pkgs | |
| parent | 73265c19c73311a600894a0d482b2a3da9a323f8 (diff) | |
| parent | 4afa4cda632d8e2530d217e98e72300d55b60347 (diff) | |
| download | nixlib-2ddcab0d89d7913dfb1001a102d7f6a45143e1d7.tar nixlib-2ddcab0d89d7913dfb1001a102d7f6a45143e1d7.tar.gz nixlib-2ddcab0d89d7913dfb1001a102d7f6a45143e1d7.tar.bz2 nixlib-2ddcab0d89d7913dfb1001a102d7f6a45143e1d7.tar.lz nixlib-2ddcab0d89d7913dfb1001a102d7f6a45143e1d7.tar.xz nixlib-2ddcab0d89d7913dfb1001a102d7f6a45143e1d7.tar.zst nixlib-2ddcab0d89d7913dfb1001a102d7f6a45143e1d7.zip | |
Merge pull request #61295 from rvolosatovs/fix/zathura
Fix Zathura on Darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/zathura/core/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/misc/zathura/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/misc/zathura/pdf-mupdf/default.nix | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index f3258c0c7116..6378cf1c0681 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/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/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index dfddfe7d91e1..e3db15ca78d4 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/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/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 709c1edb0b83..e2c08a00da20 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/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"; |