diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-10-23 23:09:27 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-24 01:18:48 +0200 |
| commit | 4dd243706813549330244c2191fb6573883f1945 (patch) | |
| tree | a50f908648a8b842b8a5a6273230da71b64ebe1b /pkgs/applications/graphics/gnome-photos | |
| parent | 20e21721c81a5b60f12c751d4af19b0355c8d5d3 (diff) | |
| download | nixpkgs-4dd243706813549330244c2191fb6573883f1945.tar nixpkgs-4dd243706813549330244c2191fb6573883f1945.tar.gz nixpkgs-4dd243706813549330244c2191fb6573883f1945.tar.bz2 nixpkgs-4dd243706813549330244c2191fb6573883f1945.tar.lz nixpkgs-4dd243706813549330244c2191fb6573883f1945.tar.xz nixpkgs-4dd243706813549330244c2191fb6573883f1945.tar.zst nixpkgs-4dd243706813549330244c2191fb6573883f1945.zip | |
gnome-photos: use Tracker 3
Diffstat (limited to 'pkgs/applications/graphics/gnome-photos')
| -rw-r--r-- | pkgs/applications/graphics/gnome-photos/default.nix | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index b4bb6e03d3c..0d4b06c8c6d 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/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 = { |