summary refs log tree commit diff
path: root/pkgs/applications/misc/zathura
diff options
context:
space:
mode:
authorTethys Svensson <freaken@freaken.dk>2020-09-13 18:45:23 +0200
committerGitHub <noreply@github.com>2020-09-13 18:45:23 +0200
commitf57a658d8e85229e27cd052b33b643d2264a2611 (patch)
tree043633a17830b257c9ee0994f5c0c6fe0e53441b /pkgs/applications/misc/zathura
parent79ff0a11279c41faf81a38ab6326af8cf1738b14 (diff)
downloadnixpkgs-f57a658d8e85229e27cd052b33b643d2264a2611.tar
nixpkgs-f57a658d8e85229e27cd052b33b643d2264a2611.tar.gz
nixpkgs-f57a658d8e85229e27cd052b33b643d2264a2611.tar.bz2
nixpkgs-f57a658d8e85229e27cd052b33b643d2264a2611.tar.lz
nixpkgs-f57a658d8e85229e27cd052b33b643d2264a2611.tar.xz
nixpkgs-f57a658d8e85229e27cd052b33b643d2264a2611.tar.zst
nixpkgs-f57a658d8e85229e27cd052b33b643d2264a2611.zip
zathura: symlinkJoin all of plugins (#96630)
* zathura: symlinkJoin all of plugins

* zathura: Add TethysSvensson as a maintainer

Co-authored-by: Matthieu Coudron <mattator@gmail.com>
Diffstat (limited to 'pkgs/applications/misc/zathura')
-rw-r--r--pkgs/applications/misc/zathura/wrapper.nix13
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix
index 5d37b5190d0..7cd52e0c74f 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@@ -1,21 +1,16 @@
 { symlinkJoin, lib, makeWrapper, zathura_core, file, plugins ? [] }:
-
-let
-  pluginsPath = lib.makeSearchPath "lib/zathura" plugins;
-
-in symlinkJoin {
+symlinkJoin {
   name = "zathura-with-plugins-${zathura_core.version}";
 
-  paths = with zathura_core; [ man dev out ];
+  paths = with zathura_core; [ man dev out ] ++ plugins;
 
-  inherit plugins;
 
   buildInputs = [ makeWrapper ];
 
   postBuild = ''
     makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \
       --prefix PATH ":" "${lib.makeBinPath [ file ]}" \
-      --add-flags --plugins-dir=${pluginsPath}
+      --add-flags --plugins-dir="$out/lib/zathura"
   '';
 
   meta = with lib; {
@@ -29,6 +24,6 @@ in symlinkJoin {
     '';
     license = licenses.zlib;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ smironov globin ];
+    maintainers = with maintainers; [ smironov globin TethysSvensson ];
   };
 }