From a0f64a2e5fd2283b361d6fe1a9b62019d997fcc5 Mon Sep 17 00:00:00 2001 From: novenary Date: Sun, 7 Jul 2024 12:42:36 +0300 Subject: [PATCH] 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 + } +)