diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-08-01 15:05:25 -0400 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-08-01 15:05:25 -0400 |
commit | da5455551048a1a50071bf88ad8a005885e3ab73 (patch) | |
tree | e57111f289b236938d0272d8f8f0f06aba368795 /pkgs/applications/misc/zathura | |
parent | ac0d7ef8705a493a6284af5b7d8f39d66a212a6b (diff) |
zathura: drop broken synctexSupport option
Diffstat (limited to 'pkgs/applications/misc/zathura')
-rw-r--r-- | pkgs/applications/misc/zathura/core/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/misc/zathura/default.nix | 7 |
2 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index af72e0a8d9ad4..585b4eef9ea36 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -3,11 +3,9 @@ , gtk, girara, gettext, libxml2, check , sqlite, glib, texlive, libintl, libseccomp , file, librsvg -, gtk-mac-integration, synctexSupport ? true +, gtk-mac-integration }: -assert synctexSupport -> texlive != null; - with stdenv.lib; stdenv.mkDerivation rec { @@ -29,7 +27,8 @@ stdenv.mkDerivation rec { # "-Dseccomp=enabled" "-Dmanpages=enabled" "-Dconvert-icon=enabled" - ] ++ optional synctexSupport "-Dsynctex=enabled"; + "-Dsynctex=enabled" + ]; nativeBuildInputs = [ meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx @@ -38,8 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk girara libintl sqlite glib file librsvg - ] ++ optional synctexSupport texlive.bin.core - ++ optional stdenv.isLinux libseccomp + texlive.bin.core + ] ++ optional stdenv.isLinux libseccomp ++ optional stdenv.isDarwin gtk-mac-integration; doCheck = true; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index e3db15ca78d4f..1548b0581b656 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,7 +1,6 @@ { config, pkgs # 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 }: +, useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin) }: let callPackage = pkgs.newScope self; @@ -9,9 +8,7 @@ let self = rec { gtk = pkgs.gtk3; - zathura_core = callPackage ./core { - inherit synctexSupport; - }; + zathura_core = callPackage ./core { }; zathura_pdf_poppler = callPackage ./pdf-poppler { }; |