46-mobile-0

README.md

@@ -21,7 +21,8 @@ This overlay targets the `nixos-unstable` channel. Please let me know if anythin
 Yes, only IBus works. You have to be careful not to set the `*_IM_MODULE` env vars (done in `./module.nix`), or the keyboard won't pop up. Example NixOS configuration:
 
 ```nix
-i18n.inputMethod.enabled = "ibus";
+i18n.inputMethod.enable = true;
+i18n.inputMethod.type = "ibus";
 i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ libpinyin anthy ];
 ```
 

module.nix

@@ -20,7 +20,7 @@
   services.logind.powerKeyLongPress = "poweroff";
 
   # Installed by default but not mobile friendly yet
-  environment.gnome.excludePackages = with pkgs.gnome; [
+  environment.gnome.excludePackages = with pkgs; with gnome; [
     totem # Videos
     simple-scan # Document Scanner
     gnome-system-monitor
@@ -28,8 +28,8 @@
     gnome-music
     baobab # Disk Usage Analyser
     evince # Document Viewer
-    pkgs.gnome-connections
+    gnome-connections
-    pkgs.gnome-tour
+    gnome-tour
   ];
 
   # Input method works, but these envvars must not be set, or the on-screen keyboard won't pop up.

overlay.nix

@@ -1,13 +1,25 @@
-self: super: {
+self: super:
+
+let
+  gvc = super.fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "libgnome-volume-control";
+    rev = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6";
+    hash = "sha256-gdgTnxzH8BeYQAsvv++Yq/8wHi7ISk2LTBfU8hk12NM=";
+  };
+in
+
+{
   gnome = super.gnome.overrideScope (gself: gsuper: {
-    gnome-shell = (gself.callPackage ./gnome-shell { }).overrideAttrs (old: {
+    gnome-shell = gsuper.gnome-shell.overrideAttrs (old: rec {
-      version = "unstable-2024-04-27";
+      version = "46-mobile-0";  # 361fc605e595b36df68d8b691f22bccddcf84cc9
       src = super.fetchFromGitLab {
         domain = "gitlab.gnome.org";
         owner = "verdre";
         repo = "mobile-shell";
-        rev = "3a352e95bf540d663f35554ee2de5dcd1ff408bc";
+        rev = version;
-        hash = "sha256-2FErBxN/WXnl7czNBM8OwVO2fIyu15vwgP6DGhLRBM4=";
+        hash = "sha256-iHDX//QsfDDSv9OnN1E4ZgxVOqzqzNHQC2/ZrAeYUL8=";
         fetchSubmodules = true;
       };
       # JS ERROR: Error: Requiring ModemManager, version none: Typelib file for namespace 'ModemManager' (any version) not found
@@ -15,27 +27,18 @@ self: super: {
       buildInputs = old.buildInputs ++ [ super.modemmanager ];
       postPatch = ''
         patchShebangs src/data-to-c.pl
-
+        ln -sf ${gvc} subprojects/gvc
-        # We can generate it ourselves.
-        rm -f man/gnome-shell.1
-
-        # Build fails with -Dgtk_doc=true
-        # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6486
-        # element include: XInclude error : could not load xxx, and no fallback was found
-        substituteInPlace docs/reference/shell/shell-docs.sgml \
-          --replace '<xi:include href="xml/shell-embedded-window.xml"/>' ' ' \
-          --replace '<xi:include href="xml/shell-gtk-embed.xml"/>' ' '
       '';
     });
 
-    mutter = (gself.callPackage ./mutter { }).overrideAttrs (old: {
+    mutter = gsuper.mutter.overrideAttrs (old: rec {
-      version = "unstable-2023-09-08";
+      version = "46-mobile-0";  # 805bce1ffa98a4aad180988c7aa7c34115da1d5d
       src = super.fetchFromGitLab {
         domain = "gitlab.gnome.org";
         owner = "verdre";
         repo = "mobile-mutter";
-        rev = "0f08f5aba4c9b5ac34b2d5711182d50b719d838e";
+        rev = version;
-        hash = "sha256-du56QMOlM7grN60eafoGTw2JGND6PK1gLrfWufihPO4=";
+        hash = "sha256-l2iKUvzW0FPPccQkhd2bDdd+BD4ZHi21MOHLhZCJwbY=";
       };
     });
   });