Jan Tojnar 2020-10-23 17:58:53 +00:00
parent ea1923841a
commit 87e3d553cf
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 10 additions and 3 deletions

View File

@ -413,7 +413,9 @@ in
in
lib.optionals tracker2needed [
tracker_2
];
] ++ removePackagesByName [
pkgs.gnome-photos
] config.environment.gnome3.excludePackages;
# Enable default program modules
# Since some of these have a corresponding package, we only

View File

@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "gnome-photos";
version = "3.37.2";
version = "3.38.0";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13wspx5kgnn1ir8q521ja0d21r1dsnh73qb8k27nkgc4zyhmm5fc";
sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6";
};
patches = [
@ -103,6 +103,11 @@ 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
# Lets 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 = {