From a0f64a2e5fd2283b361d6fe1a9b62019d997fcc5 Mon Sep 17 00:00:00 2001
From: novenary <novenary@kwak.zip>
Date: Sun, 7 Jul 2024 12:42:36 +0300
Subject: [PATCH 1/3] zathuraPkgs: turn into scope

---
 pkgs/applications/misc/zathura/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index dd8c9b143a66..1ecbcd20d270 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -1,13 +1,16 @@
 {
   config,
   pkgs,
+  lib,
   useMupdf ? true,
 }:
 
-let
-  callPackage = pkgs.newScope self;
-
-  self = rec {
+lib.makeScope pkgs.newScope (
+  self:
+  let
+    callPackage = self.callPackage;
+  in
+  rec {
     gtk = pkgs.gtk3;
 
     zathura_core = callPackage ./core { };
@@ -30,6 +33,5 @@ let
         (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler)
       ];
     };
-  };
-in
-self
+  }
+)

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 2/3] 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}";

From 94324a6d3c6035cd5520580240bbb3680792ac99 Mon Sep 17 00:00:00 2001
From: novenary <novenary@kwak.zip>
Date: Sun, 7 Jul 2024 12:58:33 +0300
Subject: [PATCH 3/3] zathuraPkgs: drop pkgs from callPackage input

---
 pkgs/applications/misc/zathura/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 9bc301985d9e..88241856632d 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -1,11 +1,13 @@
 {
   config,
-  pkgs,
   lib,
+  stdenv,
+  newScope,
+  gtk3,
   useMupdf ? true,
 }:
 
-lib.makeScope pkgs.newScope (
+lib.makeScope newScope (
   self:
   let
     callPackage = self.callPackage;
@@ -13,7 +15,7 @@ lib.makeScope pkgs.newScope (
   {
     inherit useMupdf;
 
-    gtk = pkgs.gtk3;
+    gtk = gtk3;
 
     zathura_core = callPackage ./core { };