Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 178ec8974ff7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9a27606ab178
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 5, 2021

  1. 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.
    @sternenseemann @Profpatsch
    sternenseemann authored and Profpatsch committed Jan 5, 2021
    Copy the full SHA
    9a27606 View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 pkgs/applications/misc/zathura/wrapper.nix
11 changes: 10 additions & 1 deletion pkgs/applications/misc/zathura/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {