nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 17:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnome-photos: use Tracker 3

Browse Source
This commit is contained in:
Jan Tojnar 2020-10-23 23:09:27 +02:00
parent 20e21721c8
commit 4dd2437068
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

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

29
pkgs/applications/graphics/gnome-photos/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, fetchpatch
, at-spi2-core , at-spi2-core
, babl , babl
, dbus , dbus
@ -28,8 +29,8 @@
, nixosTests , nixosTests
, pkgconfig , pkgconfig
, python3 , python3
, tracker_2 , tracker
, tracker-miners-2 , tracker-miners
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -46,6 +47,21 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./installed-tests-path.patch ./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 = [ nativeBuildInputs = [
@ -84,8 +100,8 @@ stdenv.mkDerivation rec {
gtk3 gtk3
libdazzle libdazzle
libgdata libgdata
tracker_2 tracker
tracker-miners-2 # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
at-spi2-core # for tests at-spi2-core # for tests
]; ];
@ -103,11 +119,6 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" 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 = { passthru = {