From 353c718f020497a3c263213554ad52b6862fa5ba Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 17 May 2025 19:29:47 +0800
Subject: [PATCH 1/2] 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

From 6906aed53df91c0520b9e1ce51a965dd6556e4d7 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 14 May 2025 20:49:27 +0800
Subject: [PATCH 2/2] pantheon.elementary-gtk-theme: 8.2.0 -> 8.2.1

https://github.com/elementary/stylesheet/compare/8.2.0...8.2.1

Contains style fix for epiphany 48.
---
 .../pantheon/artwork/elementary-gtk-theme/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index 7a2c36e3845b..0d2a148e2cbd 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "elementary-gtk-theme";
-  version = "8.2.0";
+  version = "8.2.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "stylesheet";
     rev = version;
-    sha256 = "sha256-l7E5o7JNqfJZzKpyvsjIVd2i9fwLh4Qn8oJ/S5RlFQ8=";
+    sha256 = "sha256-ymgSe4LKtbJVwmZJOwer1Geb/VgYltp+tSNHkWtaMlg=";
   };
 
   nativeBuildInputs = [