mate.caja: 1.24.1 -> 1.26.0

pkgs/desktops/mate/caja/caja-extension-dirs.patch

@@ -1,46 +0,0 @@
-From 35e9e6a6f3ba6cbe62a3957044eb67864f5d8e66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
-Date: Tue, 11 Feb 2020 17:49:13 -0300
-Subject: [PATCH] Look for caja extentions at $CAJA_EXTENTSION_DIRS
-
-CAJA_EXTENSION_DIRS is a list of paths where caja extensions are
-looked for. It is needed for distributions like NixOS that do not
-install all extensions in the same directory. In NixOS each package is
-installed in a self contained directory.
----
- libcaja-private/caja-module.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c
-index d54d7cf..9794e56 100644
---- a/libcaja-private/caja-module.c
-+++ b/libcaja-private/caja-module.c
-@@ -258,11 +258,25 @@ void
- caja_module_setup (void)
- {
-     static gboolean initialized = FALSE;
-+    gchar *caja_extension_dirs;
-+    gchar **dir_vector;
- 
-     if (!initialized)
-     {
-         initialized = TRUE;
- 
-+        caja_extension_dirs = (gchar *) g_getenv ("CAJA_EXTENSION_DIRS");
-+
-+        if (caja_extension_dirs)
-+        {
-+            dir_vector = g_strsplit (caja_extension_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
-+
-+            for (gchar **dir = dir_vector; *dir != NULL; ++ dir)
-+                load_module_dir (*dir);
-+
-+            g_strfreev(dir_vector);
-+        }
-+
-         load_module_dir (CAJA_EXTENSIONDIR);
- 
-         eel_debug_call_at_shutdown (free_module_objects);
--- 
-2.25.0
-

pkgs/desktops/mate/caja/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "caja";
-  version = "1.24.1";
+  version = "1.26.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0ylgb4b31vwgqmmknrhm4m9gfa1rzb9azpdd9myi0hscrr3h22z5";
+    sha256 = "1m0ai2r8b2mvlr8bqj9n6vg1pwzlwa46fqpq206wgyx5sgxac052";
   };
 
   nativeBuildInputs = [
@@ -25,10 +25,6 @@ stdenv.mkDerivation rec {
     hicolor-icon-theme
   ];
 
-  patches = [
-    ./caja-extension-dirs.patch
-  ];
-
   configureFlags = [ "--disable-update-mimedb" ];
 
   enableParallelBuilding = true;