From bd39f2c7556e3131f0ac8717521a73850c4d590f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 30 Jul 2025 21:26:03 +0800
Subject: [PATCH 1/5] pantheon.switchboard: 8.0.2 -> 8.0.3

https://github.com/elementary/switchboard/compare/8.0.2...8.0.3
---
 pkgs/desktops/pantheon/apps/switchboard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 595261aa5c12..d08e591c6a43 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard";
-  version = "8.0.2";
+  version = "8.0.3";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-iRxxXAUuSJzhX6uj1YeEzMUihWmrVZ6BFfayfteg/c8=";
+    hash = "sha256-pVXcY/QSjgBcTr0sFQnPxICoQ0tpy2fEJ687zHEDXA0=";
   };
 
   nativeBuildInputs = [

From 92b63caa5a409e05926e6aae514c231ae77c60f1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 30 Jul 2025 21:27:07 +0800
Subject: [PATCH 2/5] pantheon.switchboard-plug-sharing: 8.0.1 -> 8.0.2

https://github.com/elementary/switchboard-plug-sharing/compare/8.0.1...8.0.2
---
 .../pantheon/apps/switchboard-plugs/sharing/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index de4913d2f383..5d8f8e93554e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-sharing";
-  version = "8.0.1";
+  version = "8.0.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-BWlQrM13gI6FXoqfOKoeqtE1+HVBUB09NDatGraTYtY=";
+    hash = "sha256-XTgUHgvBSzZeuUup0gT6sbhyT4FGGG7o+qbPmfeRVQE=";
   };
 
   nativeBuildInputs = [

From 0b3faaa5e176e104377e1c384eafff841596b68d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 30 Jul 2025 21:41:44 +0800
Subject: [PATCH 3/5] pantheon.switchboard-with-plugs: Fix dbus file path

https://github.com/elementary/switchboard/commit/c63cdd984f52e3e6769beb38fdbce033080cfd2c
---
 pkgs/desktops/pantheon/apps/switchboard/wrapper.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
index 9befb909ebba..309d40b029af 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
@@ -53,6 +53,11 @@ stdenv.mkDerivation {
     for i in $(cat $pathsPath); do
       ${xorg.lndir}/bin/lndir -silent $i $out
     done
+
+    dbus_file="share/dbus-1/services/io.elementary.settings.service"
+    rm -f "$out/$dbus_file"
+    substitute "${switchboard}/$dbus_file" "$out/$dbus_file" \
+      --replace-fail "${switchboard}" "$out"
   '';
 
   preFixup = ''

From 48c857b95edae1be1fe923edc51534790f7bb7ff Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 30 Jul 2025 21:44:59 +0800
Subject: [PATCH 4/5] pantheon.granite7: Backport Gtk.init fix

Same as https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/issues/223.
---
 pkgs/desktops/pantheon/libraries/granite/7/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/desktops/pantheon/libraries/granite/7/default.nix b/pkgs/desktops/pantheon/libraries/granite/7/default.nix
index a099d23c771d..46cc6820853b 100644
--- a/pkgs/desktops/pantheon/libraries/granite/7/default.nix
+++ b/pkgs/desktops/pantheon/libraries/granite/7/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   nix-update-script,
   meson,
   ninja,
@@ -33,6 +34,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-bv2rOq16xg9lCWfcLzAFN4LjBTJBxPhXvEJzutkdYzs=";
   };
 
+  patches = [
+    # Init: Avoid crash with Gtk >= 4.17
+    # https://github.com/elementary/granite/pull/893
+    (fetchpatch {
+      url = "https://github.com/elementary/granite/commit/60cb8c4119b579592e6c7f3b1476e4d729f58699.patch";
+      hash = "sha256-6NB/Tu3mdmiBd77SOi4twdY/HidyhMn7mNN+54iFLIc=";
+    })
+  ];
+
   nativeBuildInputs = [
     gettext
     gobject-introspection

From 3b17b3a0829805b9605325e86982c1849f4515ff Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 30 Jul 2025 21:47:31 +0800
Subject: [PATCH 5/5] pantheon.gala: Backport menu location fix

---
 pkgs/desktops/pantheon/desktop/gala/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 3ef61e64cd5f..fe86b5284336 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   desktop-file-utils,
   gettext,
   libxml2,
@@ -42,6 +43,13 @@ stdenv.mkDerivation rec {
     # We look for plugins in `/run/current-system/sw/lib/` because
     # there are multiple plugin providers (e.g. gala and wingpanel).
     ./plugins-dir.patch
+
+    # Fix gtk3 daemon menu location with x2 scaling
+    # https://github.com/elementary/gala/pull/2493
+    (fetchpatch {
+      url = "https://github.com/elementary/gala/commit/33bc3ebe7f175c61845feaf2d06083f1e3b64ddc.patch";
+      hash = "sha256-hjjiKcO5o/OABKD8vUsVyqtNKN4ffEOGZntLceLr2+k=";
+    })
   ];
 
   depsBuildBuild = [ pkg-config ];