gnome-photos: use Tracker 3

nixos/modules/services/x11/desktop-managers/gnome3.nix

@@ -409,13 +409,11 @@ in
       # Temporary hack until we can drop tracker 2.
       services.dbus.packages = with pkgs.gnome3;
         let
-          tracker2needed = removePackagesByName [ pkgs.gnome-photos gnome-documents gnome-books ] config.environment.gnome3.excludePackages == [];
+          tracker2needed = removePackagesByName [ gnome-documents gnome-books ] config.environment.systemPackages != config.environment.systemPackages;
         in
           lib.optionals tracker2needed [
-            tracker_2
-          ] ++ removePackagesByName [
-            pkgs.gnome-photos
-          ] config.environment.gnome3.excludePackages;
+            pkgs.tracker_2
+          ];
 
       # Enable default program modules
       # Since some of these have a corresponding package, we only

pkgs/applications/graphics/gnome-photos/default.nix

@@ -1,5 +1,6 @@
 { stdenv
 , fetchurl
+, fetchpatch
 , at-spi2-core
 , babl
 , dbus
@@ -28,8 +29,8 @@
 , nixosTests
 , pkgconfig
 , python3
-, tracker_2
-, tracker-miners-2
+, tracker
+, tracker-miners
 , wrapGAppsHook
 }:
 
@@ -46,6 +47,21 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./installed-tests-path.patch
+
+    # Port to Tracker 3
+    # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/135
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/f39a85bb1a82093f4ba615494ff7e95609674fc2.patch";
+      sha256 = "M5r5WuB1JpUBVN3KxNvpMiPWj0pIpT+ImQMOiGtUgT4=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/3d847ff80d429cadf0bc59aa50caa37bf27c0201.patch";
+      sha256 = "zGjSL1qpWVJ/5Ifgh2CbhFSBR/WDAra8F+YUOemyxyU=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/2eb923726147b05c936dee64b205d833525db1df.patch";
+      sha256 = "vCA6NXHzmNf2GoLqzWwIyziC6puJgJ0QTLeKWsAEFAE=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -84,8 +100,8 @@ stdenv.mkDerivation rec {
     gtk3
     libdazzle
     libgdata
-    tracker_2
-    tracker-miners-2 # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
+    tracker
+    tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
 
     at-spi2-core # for tests
   ];
@@ -103,11 +119,6 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py"
-
-    # Upstream now uses a private tracker 2 instance.
-    # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/146
-    # Let’s install them after fixup since they are already wrapped.
-    ln -s ${tracker-miners-2}/libexec/tracker-extract ${tracker-miners-2}/libexec/tracker-miner-fs ${tracker_2}/libexec/tracker-store $out/libexec
   '';
 
   passthru = {