swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44909 from mnacamura/zathura

Browse source 
zathura: keep wrapper's WM_CLASS consistent with unwrapped binary
This commit is contained in:
Dmitry Kalinkin 2018-12-10 09:11:55 -05:00 committed by GitHub
parent ed46fe4f04 7bf3f0911f
commit 6fb67ca241
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig
, appstream-glib, desktop-file-utils, python3
, gtk, girara, gettext, libxml2
, file, sqlite, glib, texlive, libintl, libseccomp
, sqlite, glib, texlive, libintl, libseccomp
, gtk-mac-integration, synctexSupport ? true
}:
@ -18,22 +18,19 @@ stdenv.mkDerivation rec {
sha256 = "1znr3psqda06xklzj8mn452w908llapcg1rj468jwpg0wzv6pxfn";
};
outputs = [ "bin" "man" "dev" "out" ];
nativeBuildInputs = [
meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx
gettext makeWrapper libxml2
];
buildInputs = [
file gtk girara libintl libseccomp
gtk girara libintl libseccomp
sqlite glib
] ++ optional synctexSupport texlive.bin.core
++ optional stdenv.isDarwin [ gtk-mac-integration ];
postInstall = ''
wrapProgram "$out/bin/zathura" \
--prefix PATH ":" "${makeBinPath [ file ]}"
'';
meta = {
homepage = https://pwmt.org/projects/zathura/;
description = "A core component for zathura PDF viewer";

8
pkgs/applications/misc/zathura/wrapper.nix
View file

@ -1,4 +1,4 @@
{ symlinkJoin, lib, makeWrapper, zathura_core, plugins ? [] }:
{ symlinkJoin, lib, makeWrapper, zathura_core, file, plugins ? [] }:
let
pluginsPath = lib.makeSearchPath "lib/zathura" plugins;
@ -6,12 +6,14 @@ let
in symlinkJoin {
name = "zathura-with-plugins-${zathura_core.version}";
paths = [ zathura_core ];
paths = with zathura_core; [ man dev out ];
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/zathura --add-flags --plugins-dir=${pluginsPath}
makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \
--prefix PATH ":" "${lib.makeBinPath [ file ]}" \
--add-flags --plugins-dir=${pluginsPath}
'';
meta = with lib; {