mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Code Issues 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
parent 918e56446e da54555510
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 , gtk, girara, gettext, libxml2, check
, sqlite, glib, texlive, libintl, libseccomp , sqlite, glib, texlive, libintl, libseccomp
, file, librsvg , file, librsvg
, gtk-mac-integration, synctexSupport ? true , gtk-mac-integration
}: }:
assert synctexSupport -> texlive != null;
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -29,7 +27,8 @@ stdenv.mkDerivation rec {
# "-Dseccomp=enabled" # "-Dseccomp=enabled"
"-Dmanpages=enabled" "-Dmanpages=enabled"
"-Dconvert-icon=enabled" "-Dconvert-icon=enabled"
] ++ optional synctexSupport "-Dsynctex=enabled"; "-Dsynctex=enabled"
];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx
@ -38,8 +37,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk girara libintl sqlite glib file librsvg gtk girara libintl sqlite glib file librsvg
] ++ optional synctexSupport texlive.bin.core texlive.bin.core
++ optional stdenv.isLinux libseccomp ] ++ optional stdenv.isLinux libseccomp
++ optional stdenv.isDarwin gtk-mac-integration; ++ optional stdenv.isDarwin gtk-mac-integration;
doCheck = true; doCheck = true;

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

@ -1,7 +1,6 @@
{ config, pkgs { config, pkgs
# zathura_pdf_mupdf fails to load _opj_create_decompress at runtime on Darwin (https://github.com/NixOS/nixpkgs/pull/61295#issue-277982980) # 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) , useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin) }:
, synctexSupport ? true }:
let let
callPackage = pkgs.newScope self; callPackage = pkgs.newScope self;
@ -9,9 +8,7 @@ let
self = rec { self = rec {
gtk = pkgs.gtk3; gtk = pkgs.gtk3;
zathura_core = callPackage ./core { zathura_core = callPackage ./core { };
inherit synctexSupport;
};
zathura_pdf_poppler = callPackage ./pdf-poppler { }; zathura_pdf_poppler = callPackage ./pdf-poppler { };