From e3e9af28895992220ee700790f86197f3b56765e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 15 Aug 2022 14:03:52 +0200 Subject: [PATCH] almanah: switch to gcr & gtksourceview 4 --- pkgs/applications/misc/almanah/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 5e4f44823548..d2822bd122a9 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -7,13 +7,13 @@ , desktop-file-utils , evolution-data-server , evolution -, gcr +, gcr_4 , gettext , glib , gnome , gpgme , gtk3 -, gtksourceview3 +, gtksourceview4 , gtkspell3 , libcryptui , libxml2 @@ -42,6 +42,20 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/8c42a67695621d1e30cec933a04e633e6030bbaf.patch"; sha256 = "qyqFgYSu4emFDG/Mjwz1bZb3v3/4gwQSKmGCoPPNYCQ="; }) + + # Port to Gcr 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/14 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/cd44b476f4ffbf37c5d5f5b996ecd711db925576.patch"; + sha256 = "wJ1035NxgeTwUa0LoNcB6TSLxffoXBR3WbGAGkfggYY="; + }) + + # Port to GtkSourceView 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/15 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/0ba7f05cba7feaf2ae2c220596aead5dfc676675.patch"; + sha256 = "5uvHTPzQloEq8SVt3EnZ+8mziBdXsDmu/e92/RtyFzE="; + }) ]; nativeBuildInputs = [ @@ -59,12 +73,12 @@ stdenv.mkDerivation rec { atk cairo evolution-data-server - gcr + gcr_4 glib evolution gpgme gtk3 - gtksourceview3 + gtksourceview4 gtkspell3 libcryptui sqlite