Fix forgotten commas in microg.py

Choosing Minimal variants resulted in this without my fix:

  File "/nix/store/2a3cl1fvl0418qmkrvndx4si29w9yvv5-waydroid-script-0-unstable-2026-01-05/lib/python3.13/site-packages/stuff/microg.py", line 109, in __init__
    self.act_md5 = self.dl_links[variant][1]
                   ~~~~~~~~~~~~~~~~~~~~~~^^^
IndexError: list index out of range

default.nix

@@ -1,22 +1,4 @@
-with (import <nixpkgs> {});
-
-stdenv.mkDerivation {
-  name = "waydroid_script";
-
-  buildInputs = [
-    (python3.withPackages(ps: with ps; [ tqdm requests inquirerpy ]))
-  ];
-
-  src = ./.;
-
-  postPatch = ''
-    patchShebangs main.py
-  '';
-
-  installPhase = ''
-    mkdir -p $out/libexec
-    cp -r . $out/libexec/waydroid_script
-    mkdir -p $out/bin
-    ln -s $out/libexec/waydroid_script/main.py $out/bin/waydroid_script
-  '';
-}
+let
+  pkgs = import <nixpkgs> {};
+in
+  pkgs.callPackage ./package.nix { }

flake.lock

@@ -0,0 +1,41 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1707650010,
+        "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,21 @@
+{
+  description = "Waydroid Extras Script";
+  inputs = {
+    systems.url = "github:nix-systems/default";
+  };
+  outputs = { self, nixpkgs, systems }:
+  let
+    inherit (nixpkgs) lib;
+    eachSystem = lib.genAttrs (import systems);
+    mkApp = program: { type = "app"; inherit program; };
+  in {
+    packages = eachSystem (system: rec {
+      waydroid_script = nixpkgs.legacyPackages."${system}".callPackage ./package.nix { };
+      default = waydroid_script;
+    });
+    apps = eachSystem (system: rec {
+      waydroid_script = mkApp "${self.outputs.packages.${system}.waydroid_script}/bin/waydroid_script";
+      default = waydroid_script;
+    });
+  };
+}

main.py

@@ -18,7 +18,6 @@ from stuff.nodataperm import Nodataperm
 from stuff.smartdock import Smartdock
 from stuff.widevine import Widevine
 from stuff.fdroidpriv import FDroidPriv
-from stuff.gps import GPS
 import tools.helper as helper
 from tools import container
 from tools import images
@@ -90,8 +89,6 @@ def install_app(args):
         install_list.append(Mitm(args.ca_cert_file))
     if "fdroidpriv" in app:
         install_list.append(FDroidPriv(args.android_version))
-    if "gps" in app:
-        install_list.append(GPS(args.android_version, args.gps_host, args.baud_rate))
 
     if not container.use_overlayfs():
         copy_dir = "/tmp/waydroid"
@@ -118,7 +115,8 @@ def install_app(args):
     if not container.use_overlayfs():
         umount("vendor", copy_dir)
         umount("system", copy_dir)
-        container.upgrade()
+
+    container.upgrade()
 
 
 def remove_app(args):
@@ -146,8 +144,6 @@ def remove_app(args):
         remove_list.append(Nodataperm(args.android_version))
     if "hidestatusbar" in app:
         remove_list.append(HideStatusBar())
-    if "gps" in app:
-        remove_list.append(GPS())
 
     if not container.use_overlayfs():
         copy_dir = "/tmp/waydroid"
@@ -173,7 +169,6 @@ def hack_option(args):
         hack_list.append(Nodataperm())
     if "hidestatusbar" in options:
         hack_list.append(HideStatusBar())
-    
 
     if not container.use_overlayfs():
         copy_dir = "/tmp/waydroid"
@@ -234,10 +229,7 @@ def interact():
     if not action:
         exit()
 
-
-    install_choices = ["gapps", "microg", "libndk", "libhoudini", "magisk", "smartdock", "fdroidpriv", "widevine", "gps",]
-    baud_rate_choices = ["9600", "19200", "38400", "57600", "115200"]
-
+    install_choices = ["gapps", "microg", "libndk", "libhoudini", "magisk", "smartdock", "fdroidpriv", "widevine",]
     hack_choices = []
     if android_version=="11":
         hack_choices.extend(["nodataperm", "hidestatusbar"])
@@ -259,20 +251,6 @@ def interact():
                 default="Standard",
             ).execute()
             args.microg_variant = microg_variant
-        if "gps" in apps:
-            gps_host = inquirer.text(
-                message="Enter GPS host (default: /dev/ttyGPSD)",
-                default="/dev/ttyGPSD",
-            ).execute()
-            args.gps_host = gps_host
-            baud_rate = inquirer.select(
-                message="Enter baud rate (default: 9600)",
-                instruction="([\u2191\u2193]: [Enter]: Confirm",
-                default="9600",
-                choices=baud_rate_choices
-            ).execute()
-            args.baud_rate = baud_rate
-
         args.app = apps
         install_app(args)
     elif action == "Remove":
@@ -366,8 +344,6 @@ widevine: Add support for widevine DRM L3
 
     args = parser.parse_args()
     args.microg_variant = "Standard"
-    args.gps_host = "/dev/ttyGPSD"
-    args.baud_rate = "9600"
     if hasattr(args, 'func'):
         args_dict = vars(args)
         helper.check_root()

package.nix

@@ -0,0 +1,32 @@
+{ lib,
+  stdenvNoCC,
+  lzip,
+  python3,
+  makeWrapper }:
+let
+  wrappedPath = lib.makeBinPath [ lzip ];
+in stdenvNoCC.mkDerivation {
+  name = "waydroid_script";
+
+  buildInputs = [
+    (python3.withPackages(ps: with ps; [ tqdm requests inquirerpy ]))
+  ];
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  src = ./.;
+
+  postPatch = ''
+    patchShebangs main.py
+  '';
+
+  installPhase = ''
+    mkdir -p $out/libexec
+    cp -r . $out/libexec/waydroid_script
+    mkdir -p $out/bin
+    makeShellWrapper $out/libexec/waydroid_script/main.py $out/bin/waydroid_script \
+      --prefix PATH : "${wrappedPath}"
+  '';
+}

stuff/gps.py

@@ -1,197 +0,0 @@
-import os
-from xml.dom import minidom
-import xml.etree.ElementTree as ET
-import shutil
-from stuff.general import General
-from tools.logger import Logger
-import tools.images as images
-from tools.helper import run, host 
-from tools import container
-
-class GPS(General):
-    id = "gps"
-    partition = "vendor"
-    dl_links = ["https://github.com/Lolmc0587/android_gps_libraries/archive/refs/tags/2.1.zip","f84c369c7cebd9dbb8987ca15c6aa856"]
-    act_md5 = ...
-    dl_link = ...
-    dl_file_name = "android_gps_libraries-2.1.zip"
-    extract_to = "/tmp/android_gps_libraries-2.1"
-
-    files = [
-        "lib/hw/android.hardware.gnss@1.0-impl.so",
-        "lib64/hw/android.hardware.gnss@1.0-impl.so",
-        "lib/hw/gps.default.so",
-        "lib64/hw/gps.default.so",
-        "etc/init/android.hardware.gnss@1.0-service.rc",
-    ]
-    
-
-    def __init__(self, android_version="11", gps_host="/dev/ttyGPSD", baud_rate=9600) -> None:
-        super().__init__()
-        self.host_arch = host()
-        # Set for arm 32 bit support from file downloaded 
-        self.host = "arm64-v8a" if "arm" in self.host_arch[0] else self.host_arch[0]
-        self.gps_host = gps_host
-        self.baud_rate = baud_rate
-        self.android_version = android_version
-        self.usb_name = self.gps_host.replace("/dev/", "")
-        self.files_vendor = [
-            "bin/hw/android.hardware.gnss@1.0-service",
-        ]
-        self.config_files = {
-            "11": [
-                "etc/vintf/compatibility_matrix.legacy.xml",
-                "etc/vintf/manifest.xml",
-                "build.prop",
-            ],
-            "13": [
-                "etc/vintf/compatibility_matrix.7.xml",
-                "etc/vintf/manifest.xml",
-                "build.prop",
-            ],
-        }
-    
-        self.compatibility_files = {
-            "11": "etc/vintf/compatibility_matrix.legacy.xml",
-            "13": "etc/vintf/compatibility_matrix.7.xml",
-        }
-
-        self.dl_link = self.dl_links[0]
-        self.act_md5 = self.dl_links[1]
-
-    def update_manifest(self, manifest_path, data):
-        """
-        Update the manifest file by inserting data into the <manifest> tag and format the XML.
-        """
-        tree = ET.parse(manifest_path)
-        root = tree.getroot()
-
-        root.append(ET.fromstring(data))
-        tree.write(manifest_path, encoding="utf-8", xml_declaration=True)
-
-        with open(manifest_path, "r") as f:
-            content = f.read()
-            formatted_content = minidom.parseString(content).toprettyxml(indent="    ")
-
-        formatted_content = "\n".join(
-            [line for line in formatted_content.split("\n") if line.strip()]
-        )
-
-        with open(manifest_path, "w") as f:
-            f.write(formatted_content)
-
-    def copy(self):
-        Logger.info("Copying gps library files ...")
-        if self.android_version == "11":
-            shutil.copytree(os.path.join(self.extract_to, self.dl_file_name.replace(".zip", ""), self.android_version,
-                        self.host, "system"), os.path.join(self.copy_dir, "system"), dirs_exist_ok=True)
-            self.partition = "system"
-        if self.android_version == "13":
-            shutil.copytree(os.path.join(self.extract_to, self.dl_file_name.replace(".zip", ""), self.android_version,
-                            self.host, "system"), os.path.join(self.copy_dir, "vendor"), dirs_exist_ok=True)
-            self.partition = "vendor"
-        shutil.copytree(os.path.join(self.extract_to, self.dl_file_name.replace(".zip", ""), self.android_version,
-                        self.host, "vendor"), os.path.join(self.copy_dir, "vendor"), dirs_exist_ok=True)
-        
-    def extra1(self):
-        Logger.info("Setting extra permissions ...")
-        # set permissions for vendor files
-        path = os.path.join(self.copy_dir, "vendor", self.files_vendor[0])
-        self.set_perm2(path, recursive=True)
-        
-        # Copy nessessary files to the overlayfs
-        container.stop()
-        copy_dir = "/tmp/waydroid"
-        if container.use_overlayfs():
-            img = os.path.join(images.get_image_dir(), "system.img")
-            # images.mount(img, copy_dir)
-            if not os.path.exists(copy_dir):
-                os.makedirs(copy_dir)
-            run(["sudo", "mount", img, copy_dir])
-
-            for file in self.config_files[self.android_version]:
-                file_dir = os.path.join(self.copy_dir, "system", file)
-                if not os.path.exists(os.path.dirname(file_dir)):
-                    os.makedirs(os.path.dirname(file_dir))
-                shutil.copyfile(os.path.join(copy_dir, "system", file), file_dir)
-                self.set_perm2(file_dir, recursive=True)
-
-            if self.android_version == "13":
-                # Copy missing libraries file for android 13 vendor partition from system partition
-                if not os.path.exists(os.path.join(self.copy_dir, "vendor", "lib64", "hw")):
-                    os.makedirs(os.path.join(self.copy_dir, "vendor", "lib64", "hw"))
-
-                copy_ = True
-                if "arm" in self.host and self.host_arch[1] == 32:
-                    copy_ = False
-                if copy_:
-                    shutil.copyfile(os.path.join(copy_dir, "system", "lib64/android.hardware.gnss@1.0.so"),
-                                    os.path.join(self.copy_dir, "vendor", "lib64/hw/android.hardware.gnss@1.0.so"))
-                
-                if not os.path.exists(os.path.join(self.copy_dir, "vendor", "lib", "hw")):
-                    os.makedirs(os.path.join(self.copy_dir, "vendor", "lib", "hw"))
-
-                shutil.copyfile(os.path.join(copy_dir, "system", "lib/android.hardware.gnss@1.0.so"),
-                                os.path.join(self.copy_dir, "vendor", "lib/hw/android.hardware.gnss@1.0.so"))
-                
-            images.umount(copy_dir)
-        
-        # Update manifest files
-        container.upgrade()
-        
-        manifest_entry_1 = """
-            <hal format="hidl" optional="true">
-                <name>android.hardware.gnss</name>
-                <version>1.0</version>
-                <interface>
-                    <name>IGnss</name>
-                    <instance>default</instance>
-                </interface>
-            </hal>
-        """
-        self.update_manifest(
-            os.path.join(self.copy_dir, "system", self.compatibility_files[self.android_version]),
-            data=manifest_entry_1,
-        )
-
-        manifest_entry_2 = """
-            <hal format="hidl">
-                <name>android.hardware.gnss</name>
-                <transport>hwbinder</transport>
-                <version>1.0</version>
-                <interface>
-                    <name>IGnss</name>
-                    <instance>default</instance>
-                </interface>
-                <fqname>@1.0::IGnss/default</fqname>
-            </hal>
-        """
-        self.update_manifest(os.path.join(self.copy_dir, "system", "etc", "vintf", "manifest.xml"), data=manifest_entry_2)
-        config_nodes = "/var/lib/waydroid/lxc/waydroid/config_nodes"
-        # lxc.mount.entry = /dev/ttyGPSD dev/ttyGPSD none bind,create=file,optional 0 0
-
-        with open(config_nodes, "a") as f:
-            f.write(f"lxc.mount.entry = {self.gps_host} dev/{self.usb_name} none bind,create=file,optional 0 0\n")
-
-        with open(os.path.join(self.copy_dir, "system", "build.prop"), "a") as f:
-            f.write("ro.factory.hasGPS=true\n")
-            f.write(f"ro.kernel.android.gps={self.usb_name}\n")
-            f.write(f"ro.kernel.android.gps.speed={self.baud_rate}\n")
-        Logger.warning(
-            "You need to add user to the 'dialout' group to access the GPS device."
-            "\nYou can do this by running: sudo usermod -aG dialout <your_username>"
-            "\nand then reboot your system."
-        )
-    def extra2(self):
-        # Remove vendor files from system partition
-        self.files = self.files_vendor
-        self.partition = "vendor"
-        self.remove()
-
-        # Remove config files from system partition
-        self.files = self.config_files[self.android_version]
-        self.partition = "system"
-        self.remove()
-
-        container.upgrade()
-        

stuff/houdini.py

@@ -10,7 +10,7 @@ class Houdini(General):
     partition = "system"
     dl_links = {
         "11": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/81f2a51ef539a35aead396ab7fce2adf89f46e88.zip", "fbff756612b4144797fbc99eadcb6653"],
-        "13": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/7e21ea3f63bd89e9e8af54e32da41bd8b65c93a1.zip", "f8cf5db10e5fdb9b77e98e515a9b08c9"]
+        "13": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/9e77896350caccd228b36b2e1b4a994aa4bd48da.zip", "3807fe029559db3037efe245d9e74270"]
     }
     act_md5 = ...
     dl_link = ...

stuff/microg.py

@@ -36,11 +36,11 @@ class MicroG(General):
             "6136b383153c2a6797d14fb4d7ca3f97"
         ],
         "Minimal": [
-            "https://github.com/ayasa520/MinMicroG/releases/download/latest/MinMicroG-Minimal-2.11.1-20230429100521.zip"
+            "https://github.com/ayasa520/MinMicroG/releases/download/latest/MinMicroG-Minimal-2.11.1-20230429100521.zip",
             "afb87eb64e7749cfd72c4760d85849da"
         ],
         "MinimalIAP": [
-            "https://github.com/ayasa520/MinMicroG/releases/download/latest/MinMicroG-MinimalIAP-2.11.1-20230429100556.zip"
+            "https://github.com/ayasa520/MinMicroG/releases/download/latest/MinMicroG-MinimalIAP-2.11.1-20230429100556.zip",
             "cc071f4f776cbc16c4c1f707aff1f7fa"
         ]
     }

stuff/nodataperm.py

@@ -10,19 +10,23 @@ from tools import container
 class Nodataperm(General):
     id = "nodataperm"
     dl_links = {
-        "11":
-        {
+        "11": {
+            "x86_64": [
+                "https://github.com/ayasa520/hack_full_data_permission/archive/d4beab7780eb792059d33e77d865579c9ee41546.zip",
+                "b0e3908ffcf5df8ea62f4929aa680f1a"
+            ],
+        },
+        "13": {
             "x86_64": [
                 "https://github.com/ayasa520/hack_full_data_permission/archive/d4beab7780eb792059d33e77d865579c9ee41546.zip",
                 "b0e3908ffcf5df8ea62f4929aa680f1a"
             ],
         },
-        "13": {}
     }
     dl_file_name = "nodataperm.zip"
     extract_to = "/tmp/nodataperm"
-    dl_link = ...
-    act_md5 = ...
+    dl_link = None
+    act_md5 = None
     partition = "system"
     files = [
         "etc/nodataperm.sh",
@@ -36,11 +40,15 @@ class Nodataperm(General):
         super().__init__()
         print("ok")
         arch = self.arch[0]
+        if android_version not in self.dl_links:
+            raise KeyError(f"No download links for Android version '{android_version}'")
+        if arch not in self.dl_links[android_version]:
+            raise KeyError(f"No download links for architecture '{arch}' in Android version '{android_version}'")
         self.dl_link = self.dl_links[android_version][arch][0]
         self.act_md5 = self.dl_links[android_version][arch][1]
 
     def copy(self):
-        name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
+        name = re.findall(r"([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
         extract_path = os.path.join(
             self.extract_to, f"hack_full_data_permission-{name}")
         if not container.use_overlayfs():