From c87f6b55911a705be2437274820f46b3e605188a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 Feb 2024 17:21:53 +0800
Subject: [PATCH] mate: Install caja-with-extensions by default

---
 nixos/modules/services/x11/desktop-managers/mate.nix | 3 ---
 pkgs/desktops/mate/default.nix                       | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index f535a1d298b9..89008f0124da 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -37,9 +37,6 @@ in
       pkgs.mate.mate-session-manager
     ];
 
-    # Let caja find extensions
-    environment.sessionVariables.CAJA_EXTENSION_DIRS = [ "${config.system.path}/lib/caja/extensions-2.0" ];
-
     # Let mate-panel find applets
     environment.sessionVariables."MATE_PANEL_APPLETS_DIR" = "${config.system.path}/share/mate-panel/applets";
     environment.sessionVariables."MATE_PANEL_EXTRA_MODULES" = "${config.system.path}/lib/mate-panel/applets";
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 910c973ff4ec..bbd9f8c09989 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -54,7 +54,7 @@ let
     python-caja = callPackage ./python-caja { };
 
     basePackages = [
-      caja
+      caja-with-extensions
       libmatekbd
       libmatemixer
       libmateweather
@@ -75,7 +75,7 @@ let
 
     extraPackages = [
       atril
-      caja-extensions
+      caja-extensions # for caja-sendto
       engrampa
       eom
       mate-applets