zathura: cleanup and hide zathuraCollection

Fixes #17787.

1 files changed, 18 insertions, 47 deletions

diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index ed121be6dcd..e67bebb3710 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -1,59 +1,30 @@
-{ callPackage, lib, pkgs, fetchurl, stdenv, useMupdf, synctexSupport ? true }:
+{ pkgs, useMupdf ? true, synctexSupport ? true }:
 
-rec {
-  inherit stdenv;
+let
+  callPackage = pkgs.newScope self;
 
-  icon = ./icon.xpm;
-
-  zathura_core = callPackage ./core {
-    gtk = pkgs.gtk3;
-    zathura_icon = icon;
-    inherit synctexSupport;
-  };
-
-  zathura_pdf_poppler = callPackage ./pdf-poppler { };
-
-  zathura_pdf_mupdf = callPackage ./pdf-mupdf {
-    gtk = pkgs.gtk3;
-  };
-
-  zathura_djvu = callPackage ./djvu {
+  self = rec {
     gtk = pkgs.gtk3;
-  };
 
-  zathura_ps = callPackage ./ps {
-    gtk = pkgs.gtk3;
-  };
-
-  zathuraWrapper = stdenv.mkDerivation {
-
-    inherit zathura_core icon;
+    zathura_core = callPackage ./core {
+      inherit synctexSupport;
+    };
 
-    name = "zathura-${zathura_core.version}";
+    zathura_pdf_poppler = callPackage ./pdf-poppler { };
 
-    plugins_path = stdenv.lib.makeLibraryPath [
-      zathura_djvu
-      zathura_ps
-      (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler)
-    ];
+    zathura_pdf_mupdf = callPackage ./pdf-mupdf { };
 
-    builder = ./builder.sh;
+    zathura_djvu = callPackage ./djvu { };
 
-    preferLocalBuild = true;
+    zathura_ps = callPackage ./ps { };
 
-    meta = with lib; {
-      homepage = http://pwmt.org/projects/zathura/;
-      description = "A highly customizable and functional PDF viewer";
-      longDescription = ''
-        Zathura is a highly customizable and functional PDF viewer based on the
-        poppler rendering library and the gtk+ toolkit. The idea behind zathura
-        is an application that provides a minimalistic and space saving interface
-        as well as an easy usage that mainly focuses on keyboard interaction.
-      '';
-      license = licenses.zlib;
-      platforms = platforms.linux;
-      maintainers = with maintainers;[ garbas smironov ];
+    zathuraWrapper = callPackage ./wrapper.nix {
+      plugins = [
+        zathura_djvu
+        zathura_ps
+        (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler)
+      ];
     };
   };
-}
 
+in self.zathuraWrapper