diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 5d90cefdff39..56874df59f56 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , gettext @@ -29,13 +31,22 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "41.4"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-40CxP0b+C31bD48BQTKR3c2HDHSlw4+iTKwfWF5wOT4="; + sha256 = "sha256-LuEQu6nDjs4ebdNGmyjWCD/soMvGNRFaGU1nBp1MM4Y="; }; + patches = [ + # Do not pin to GWeather 3.0, the used API did not change in 4.0. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-maps/-/commit/759d3087b70341b2c5f1af575ce44338d926690e.patch"; + sha256 = "Qp9Hta00TLf2lOb9+g9vnPoK17mP3eHpCG2i1ewaw+w="; + revert = true; + }) + ]; + doCheck = true; nativeBuildInputs = [ @@ -78,7 +89,7 @@ stdenv.mkDerivation rec { # entry point to the wrapped binary we get back to a wrapped # binary. substituteInPlace "data/org.gnome.Maps.service.in" \ - --replace "Exec=@pkgdatadir@/org.gnome.Maps" \ + --replace "Exec=@pkgdatadir@/@app-id@" \ "Exec=$out/bin/gnome-maps" '';