From 3dc8993b21cf1be360547f24e580ccbc351b7e0f Mon Sep 17 00:00:00 2001
From: novenary <novenary@kwak.zip>
Date: Sun, 7 Jul 2024 12:48:45 +0300
Subject: [PATCH] zathuraPkgs: move default plugins into wrapper

---
 pkgs/applications/misc/zathura/default.nix | 13 ++++---------
 pkgs/applications/misc/zathura/wrapper.nix | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 1ecbcd20d270..9bc301985d9e 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -10,7 +10,9 @@ lib.makeScope pkgs.newScope (
   let
     callPackage = self.callPackage;
   in
-  rec {
+  {
+    inherit useMupdf;
+
     gtk = pkgs.gtk3;
 
     zathura_core = callPackage ./core { };
@@ -25,13 +27,6 @@ lib.makeScope pkgs.newScope (
 
     zathura_cb = callPackage ./cb { };
 
-    zathuraWrapper = callPackage ./wrapper.nix {
-      plugins = [
-        zathura_djvu
-        zathura_ps
-        zathura_cb
-        (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler)
-      ];
-    };
+    zathuraWrapper = callPackage ./wrapper.nix { };
   }
 )
diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix
index 5d60c4822212..4290fff26bcf 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@@ -3,8 +3,19 @@
   lib,
   makeWrapper,
   zathura_core,
+  zathura_djvu,
+  zathura_ps,
+  zathura_cb,
+  zathura_pdf_mupdf,
+  zathura_pdf_poppler,
   file,
-  plugins ? [ ],
+  useMupdf,
+  plugins ? [
+    zathura_djvu
+    zathura_ps
+    zathura_cb
+    (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler)
+  ],
 }:
 symlinkJoin {
   name = "zathura-with-plugins-${zathura_core.version}";