Merge pull request #158246 from Ma27/zathura-overrides

zathura: improve overridability; set plugin dir through the environment

pkgs/applications/misc/zathura/default.nix

@@ -30,4 +30,4 @@ let
     };
   };
 
-in self.zathuraWrapper
+in self

pkgs/applications/misc/zathura/wrapper.nix

@@ -11,7 +11,7 @@ symlinkJoin {
   in ''
     makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \
       --prefix PATH ":" "${lib.makeBinPath [ file ]}" \
-      --add-flags --plugins-dir="$out/lib/zathura"
+      --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura"
 
     # zathura fish completion references the zathura_core derivation to
     # check for supported plugins which live in the wrapper derivation,

pkgs/top-level/all-packages.nix

@@ -30270,7 +30270,8 @@ with pkgs;
 
   zanshin = libsForQt5.callPackage ../applications/office/zanshin { };
 
-  zathura = callPackage ../applications/misc/zathura { };
+  zathuraPkgs = callPackage ../applications/misc/zathura { };
+  zathura = zathuraPkgs.zathuraWrapper;
 
   zdns = callPackage ../tools/security/zdns { };