From 38fab35c79d4e8e46e5a638cbd426fd81ef29066 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 30 Apr 2023 21:48:06 +0800
Subject: [PATCH 1/2] mate.atril: Remove file-wide `with lib;`

---
 pkgs/desktops/mate/atril/default.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index c236cc919d88..8ca835fc1652 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -25,8 +25,6 @@
 , mateUpdateScript
 }:
 
-with lib;
-
 stdenv.mkDerivation rec {
   pname = "atril";
   version = "1.26.0";
@@ -54,18 +52,18 @@ stdenv.mkDerivation rec {
     hicolor-icon-theme
     texlive.bin.core # for synctex, used by the pdf back-end
   ]
-  ++ optionals enableDjvu [ djvulibre ]
-  ++ optionals enableEpub [ webkitgtk ]
-  ++ optionals enablePostScript [ libspectre ]
-  ++ optionals enableXps [ libgxps ]
+  ++ lib.optionals enableDjvu [ djvulibre ]
+  ++ lib.optionals enableEpub [ webkitgtk ]
+  ++ lib.optionals enablePostScript [ libspectre ]
+  ++ lib.optionals enableXps [ libgxps ]
   ;
 
   configureFlags = [ ]
-    ++ optionals (enableDjvu) [ "--enable-djvu" ]
-    ++ optionals (enableEpub) [ "--enable-epub" ]
-    ++ optionals (enablePostScript) [ "--enable-ps" ]
-    ++ optionals (enableXps) [ "--enable-xps" ]
-    ++ optionals (enableImages) [ "--enable-pixbuf" ];
+    ++ lib.optionals (enableDjvu) [ "--enable-djvu" ]
+    ++ lib.optionals (enableEpub) [ "--enable-epub" ]
+    ++ lib.optionals (enablePostScript) [ "--enable-ps" ]
+    ++ lib.optionals (enableXps) [ "--enable-xps" ]
+    ++ lib.optionals (enableImages) [ "--enable-pixbuf" ];
 
   env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 

From 181270881d0752775eace7de6f373ee7ae92d06a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 30 Apr 2023 13:48:46 +0000
Subject: [PATCH 2/2] mate.atril: 1.26.0 -> 1.26.1

https://github.com/mate-desktop/atril/compare/v1.26.0...v1.26.1
---
 pkgs/desktops/mate/atril/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index 8ca835fc1652..6c93c5084b4b 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation rec {
   pname = "atril";
-  version = "1.26.0";
+  version = "1.26.1";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0pz44k3axhjhhwfrfvnwvxak1dmjkwqs63rhrbcaagyymrp7cpki";
+    sha256 = "pTphOsuXAaGK1nG/WQJU0c6Da6CuG+LAvYlI/fa0kaQ=";
   };
 
   nativeBuildInputs = [