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

Merge pull request #65743 from veprbl/pr/zathura_drop_no_synctex

Browse Source 
zathura: drop broken synctexSupport option
This commit is contained in:
Robin Gloster 2019-08-01 22:51:24 +00:00 committed by GitHub
commit 919518608f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

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

@ -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 { };