From 9a27606ab1781a01a75f7c2d519fd6ee2b4b867c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 4 Jan 2021 19:32:18 +0100 Subject: [PATCH] zathura: fix fish completions The fish completion checks the plugin directory for supported file types to complete. However the plugin dir checked was the one of the zathura_core derivation which of course has no plugin dir. We now patch up the referenced path in the wrapper derivation. --- pkgs/applications/misc/zathura/wrapper.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 7cd52e0c74f1..60e3bb9fd535 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -7,10 +7,19 @@ symlinkJoin { buildInputs = [ makeWrapper ]; - postBuild = '' + postBuild = let + fishCompletion = "share/fish/vendor_completions.d/zathura.fish"; + in '' makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \ --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ --add-flags --plugins-dir="$out/lib/zathura" + + # zathura fish completion references the zathura_core derivation to + # check for supported plugins which live in the wrapper derivation, + # so we need to fix the path to reference $out instead. + rm "$out/${fishCompletion}" + substitute "${zathura_core.out}/${fishCompletion}" "$out/${fishCompletion}" \ + --replace "${zathura_core.out}" "$out" ''; meta = with lib; {