From aaae71ce2023ce9ad3b5456eb8667742a3a74156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=97=8D+85CD?= <50108258+kwaa@users.noreply.github.com>
Date: Sat, 21 Sep 2024 14:14:33 +0800
Subject: [PATCH] fix(overlay): remove `gnome` scope

---
 overlay.nix | 56 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index ad5b32d..500f20f 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -11,36 +11,34 @@ let
 in
 
 {
-  gnome = super.gnome.overrideScope (gself: gsuper: {
-    gnome-shell = gsuper.gnome-shell.overrideAttrs (old: rec {
-      version = "46-mobile-0";  # 361fc605e595b36df68d8b691f22bccddcf84cc9
-      src = super.fetchFromGitLab {
-        domain = "gitlab.gnome.org";
-        owner = "verdre";
-        repo = "mobile-shell";
-        rev = version;
-        hash = "sha256-iHDX//QsfDDSv9OnN1E4ZgxVOqzqzNHQC2/ZrAeYUL8=";
-        fetchSubmodules = true;
-      };
-      # JS ERROR: Error: Requiring ModemManager, version none: Typelib file for namespace 'ModemManager' (any version) not found
-      # @resource:///org/gnome/shell/misc/modemManager.js:4:49
-      buildInputs = old.buildInputs ++ [ super.modemmanager ];
-      postPatch = ''
-        patchShebangs src/data-to-c.pl
-        ln -sf ${gvc} subprojects/gvc
-      '';
-    });
+  gnome-shell = super.gnome-shell.overrideAttrs (old: rec {
+    version = "46-mobile-0";  # 361fc605e595b36df68d8b691f22bccddcf84cc9
+    src = super.fetchFromGitLab {
+      domain = "gitlab.gnome.org";
+      owner = "verdre";
+      repo = "mobile-shell";
+      rev = version;
+      hash = "sha256-iHDX//QsfDDSv9OnN1E4ZgxVOqzqzNHQC2/ZrAeYUL8=";
+      fetchSubmodules = true;
+    };
+    # JS ERROR: Error: Requiring ModemManager, version none: Typelib file for namespace 'ModemManager' (any version) not found
+    # @resource:///org/gnome/shell/misc/modemManager.js:4:49
+    buildInputs = old.buildInputs ++ [ super.modemmanager ];
+    postPatch = ''
+      patchShebangs src/data-to-c.pl
+      ln -sf ${gvc} subprojects/gvc
+    '';
+  });
 
-    mutter = gsuper.mutter.overrideAttrs (old: rec {
-      version = "46-mobile-0";  # 805bce1ffa98a4aad180988c7aa7c34115da1d5d
-      src = super.fetchFromGitLab {
-        domain = "gitlab.gnome.org";
-        owner = "verdre";
-        repo = "mobile-mutter";
-        rev = version;
-        hash = "sha256-l2iKUvzW0FPPccQkhd2bDdd+BD4ZHi21MOHLhZCJwbY=";
-      };
-    });
+  mutter = super.mutter.overrideAttrs (old: rec {
+    version = "46-mobile-0";  # 805bce1ffa98a4aad180988c7aa7c34115da1d5d
+    src = super.fetchFromGitLab {
+      domain = "gitlab.gnome.org";
+      owner = "verdre";
+      repo = "mobile-mutter";
+      rev = version;
+      hash = "sha256-l2iKUvzW0FPPccQkhd2bDdd+BD4ZHi21MOHLhZCJwbY=";
+    };
   });
 }