diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar')
| -rw-r--r-- | nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix | 56 | ||||
| -rw-r--r-- | nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch | 17 |
2 files changed, 20 insertions, 53 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index db353165c28d..10267a6c8701 100644 --- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -1,47 +1,32 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja , pkg-config -, wrapGAppsHook -, libdazzle +, wrapGAppsHook4 , libgweather , geoclue2 , geocode-glib -, python3 , gettext , libxml2 , gnome -, gtk3 +, gtk4 , evolution-data-server +, libical , libsoup , glib -, gnome-online-accounts , gsettings-desktop-schemas -, libhandy -, adwaita-icon-theme +, libadwaita }: stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "41.2"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lWsvGQMiZRxn/mZyI4lviqWs8ztwraWjsFpTYb2mYRo="; - }; - - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84 - # A refactor has caused the PR patch to drift enough to need rebasing - ./gtk_image_reset_crash.patch - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; - }; + sha256 = "tj9z9VAy/BOQRC+UzfazyrnJHHdN3S5cYez+ydLF6ao="; }; nativeBuildInputs = [ @@ -50,35 +35,34 @@ stdenv.mkDerivation rec { pkg-config gettext libxml2 - wrapGAppsHook - python3 + wrapGAppsHook4 ]; buildInputs = [ - gtk3 - evolution-data-server + gtk4 + evolution-data-server # waiting for GTK4 port + libical libsoup glib - gnome-online-accounts - libdazzle libgweather geoclue2 geocode-glib gsettings-desktop-schemas - adwaita-icon-theme - libhandy + libadwaita ]; - postPatch = '' - chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file - patchShebangs build-aux/meson/meson_post_install.py - ''; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Calendar"; description = "Simple and beautiful calendar application for GNOME"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch b/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch deleted file mode 100644 index 5065295b57b7..000000000000 --- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/gui/views/gcal-year-view.c b/src/gui/views/gcal-year-view.c -index ac32a8f9..532425c1 100644 ---- a/src/gui/views/gcal-year-view.c -+++ b/src/gui/views/gcal-year-view.c -@@ -2158,7 +2158,11 @@ update_weather (GcalYearView *self) - if (!updated) - { - gtk_label_set_text (self->temp_label, ""); -- gtk_image_clear (self->weather_icon); -+ /* FIXME: This should never be NULL, but it somehow is. -+ * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299 -+ */ -+ if (self->weather_icon != NULL) -+ gtk_image_clear (self->weather_icon); - } - } - |