From 353c718f020497a3c263213554ad52b6862fa5ba Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 17 May 2025 19:29:47 +0800 Subject: [PATCH] epiphany: Fix startup crash on Pantheon * gdk_display_manager_get() was called before gtk_init() * gtk_menu_button_set_icon_name: assertion 'GTK_IS_MENU_BUTTON (menu_button)' failed --- pkgs/by-name/ep/epiphany/package.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix index de050c54c7b7..6ac61bc3b2f5 100644 --- a/pkgs/by-name/ep/epiphany/package.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -5,6 +5,7 @@ ninja, gettext, fetchurl, + fetchpatch, pkg-config, gtk4, glib, @@ -44,6 +45,22 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2ilT5+K3O/dHPAozl5EE15NieVKV6qCio46hiFN9rxM="; }; + patches = [ + # shell: Fix startup crash on Pantheon + # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1818 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/da4437beb7f1fbc9c2fa3d4629b8c826d484835e.patch"; + hash = "sha256-meufd5gnhLcK0dgIXEMDnid9e1R2M1D3jZ9Yoh6YobM="; + }) + + # action-bar-end: Fix startup crash on Pantheon + # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1819 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/d69866854b315123c8832fae58c6de008da20ea0.patch"; + hash = "sha256-GnZQC4rtBYRr+x9mF8pCFDcDOjEJj+27ECdXBNL42kQ="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext