From 0e989a5bd96ee67ad435b3b548c5ab85ec514b23 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 7 Aug 2022 17:11:53 +0000
Subject: [PATCH] =?UTF-8?q?gnome.nautilus:=2043.alpha=20=E2=86=92=2043.bet?=
 =?UTF-8?q?a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/nautilus/-/compare/43.alpha...43.beta

Also change the environment variable name to prevent crashes when running in an old environment.

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
---
 nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +-
 pkgs/desktops/gnome/apps/file-roller/default.nix      | 2 +-
 pkgs/desktops/gnome/core/nautilus/default.nix         | 9 +++++++--
 pkgs/desktops/gnome/core/nautilus/extension_dir.patch | 2 +-
 pkgs/desktops/gnome/misc/nautilus-python/default.nix  | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index c91181491fa1..9c1978e362bc 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -520,7 +520,7 @@ in
 
       # Let nautilus find extensions
       # TODO: Create nautilus-with-extensions package
-      environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
+      environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-4";
 
       # Override default mimeapps for nautilus
       environment.sessionVariables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix
index 12cb3a223fab..a39df566c9c2 100644
--- a/pkgs/desktops/gnome/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome/apps/file-roller/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     nautilus
   ];
 
-  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-4";
 
   postPatch = ''
     chmod +x postinstall.py # patchShebangs requires executable file
diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix
index 37c5ac2aa724..95f4f0b671cf 100644
--- a/pkgs/desktops/gnome/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome/core/nautilus/default.nix
@@ -23,23 +23,25 @@
 , tracker-miners
 , gexiv2
 , libselinux
+, libcloudproviders
 , gdk-pixbuf
 , substituteAll
 , gnome-desktop
 , gst_all_1
 , gsettings-desktop-schemas
+, gnome-user-share
 , gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
   pname = "nautilus";
-  version = "43.alpha";
+  version = "43.beta";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "hjVoot3dHPgTNmbDe4Cwf4AN6Wbomh0l4QM0mP+iw5k=";
+    sha256 = "5SEptSc/ZBb///prJr00pWrLfUXltuCVU1UpOhZXkfU=";
   };
 
   patches = [
@@ -70,6 +72,7 @@ stdenv.mkDerivation rec {
     gnome-desktop
     gnome.adwaita-icon-theme
     gsettings-desktop-schemas
+    gnome-user-share
     gst_all_1.gst-plugins-base
     gtk4
     libadwaita
@@ -78,6 +81,8 @@ stdenv.mkDerivation rec {
     libnotify
     libseccomp
     libselinux
+    gdk-pixbuf
+    libcloudproviders
     shared-mime-info
     tracker
     tracker-miners
diff --git a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch
index e1313999675d..344a50fa45b9 100644
--- a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch
+++ b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch
@@ -13,7 +13,7 @@ index 6273a76..4adcc8a 100644
          initialized = TRUE;
  
 -        load_module_dir (NAUTILUS_EXTENSIONDIR);
-+        extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
++        extensiondir = g_getenv ("NAUTILUS_4_EXTENSION_DIR");
 +        if (extensiondir == NULL) {
 +            extensiondir = NAUTILUS_EXTENSIONDIR;
 +        }
diff --git a/pkgs/desktops/gnome/misc/nautilus-python/default.nix b/pkgs/desktops/gnome/misc/nautilus-python/default.nix
index db304bcf5859..7bc446a29de0 100644
--- a/pkgs/desktops/gnome/misc/nautilus-python/default.nix
+++ b/pkgs/desktops/gnome/misc/nautilus-python/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     "PYTHON_LIB_LOC=${python3}/lib"
   ];
 
-  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-4";
 
   passthru = {
     updateScript = gnome.updateScript {