From 61ede8ed23386c29871335a0b6c8b026a5dd176e Mon Sep 17 00:00:00 2001 From: mivorasu Date: Fri, 1 Aug 2025 08:48:05 +0800 Subject: [PATCH 1/3] waydroid-helper: various fixes --- pkgs/by-name/wa/waydroid-helper/package.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix index 42dd8bda565a..a57bf766b492 100644 --- a/pkgs/by-name/wa/waydroid-helper/package.nix +++ b/pkgs/by-name/wa/waydroid-helper/package.nix @@ -16,8 +16,12 @@ dbus, systemd, bash, + bindfs, + e2fsprogs, fakeroot, + fuse, gobject-introspection, + unzip, }: python3Packages.buildPythonApplication rec { @@ -38,7 +42,9 @@ python3Packages.buildPythonApplication rec { --replace-fail "dbus_service_dir," "'$out/share/dbus-1/system-services'," substituteInPlace systemd/meson.build \ --replace-fail ": systemd_system_unit_dir" ": '$out/lib/systemd/system'" \ - --replace-fail ": systemd_user_unit_dir" ": '$out/lib/sysusers.d'" + --replace-fail ": systemd_user_unit_dir" ": '$out/lib/systemd/user'" + substituteInPlace systemd/{system/waydroid-mount,user/waydroid-monitor}.service \ + --replace-fail "/usr/bin/waydroid-helper" "$out/bin/waydroid-helper" # com.jaoushingan.WaydroidHelper.desktop: component-name-missing, description-first-para-too-short # url-homepage-missing, desktop-app-launchable-omitted, content-rating-missing, developer-info-missing sed -i '/test(/{N;/Validate appstream file/!b;:a;N;/)/!ba;d}' data/meson.build @@ -80,7 +86,15 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" - "--prefix PATH : ${lib.makeBinPath [ fakeroot ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + bindfs + e2fsprogs + fakeroot + fuse + unzip + ] + }" ]; postInstallCheck = '' From 88df1b409fc07d82af8bdc7c31b8eb90258a70f9 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Fri, 1 Aug 2025 08:49:00 +0800 Subject: [PATCH 2/3] waydroid-helper: 0.1.2 -> 0.2.3 Diff: https://github.com/ayasa520/waydroid-helper/compare/refs/tags/v0.1.2...refs/tags/v0.2.3 Changelog: https://github.com/ayasa520/waydroid-helper/releases/tag/v0.2.3 --- pkgs/by-name/wa/waydroid-helper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix index a57bf766b492..f84ce8caf412 100644 --- a/pkgs/by-name/wa/waydroid-helper/package.nix +++ b/pkgs/by-name/wa/waydroid-helper/package.nix @@ -26,14 +26,14 @@ python3Packages.buildPythonApplication rec { pname = "waydroid-helper"; - version = "0.1.2"; + version = "0.2.3"; pyproject = false; # uses meson src = fetchFromGitHub { owner = "ayasa520"; repo = "waydroid-helper"; tag = "v${version}"; - hash = "sha256-dYduO5Wi8Ia/pR1xQKPhC6Ek/1Q9fm2RaVuhm9KYiU0="; + hash = "sha256-QxtCxujf7S3YRx/4rRMecFBomP+9tqrIBdYhc3WQT20="; }; postPatch = '' @@ -104,7 +104,7 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = nix-update-script { }; meta = { - description = "Provides a user-friendly way to configure Waydroid and install extensions"; + description = "User-friendly way to configure Waydroid and install extensions, including Magisk and ARM translation"; homepage = "https://github.com/ayasa520/waydroid-helper"; changelog = "https://github.com/ayasa520/waydroid-helper/releases/tag/${src.tag}"; mainProgram = "waydroid-helper"; From 10cbc86a5c2c628c6fa11ae5c05659a2d6f8797b Mon Sep 17 00:00:00 2001 From: mivorasu Date: Fri, 1 Aug 2025 08:54:30 +0800 Subject: [PATCH 3/3] waydroid-helper: sort --- pkgs/by-name/wa/waydroid-helper/package.nix | 59 +++++++++++---------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix index f84ce8caf412..81fa878b05ab 100644 --- a/pkgs/by-name/wa/waydroid-helper/package.nix +++ b/pkgs/by-name/wa/waydroid-helper/package.nix @@ -1,33 +1,31 @@ { lib, + python3Packages, fetchFromGitHub, - nix-update-script, + appstream, + cmake, desktop-file-utils, - libadwaita, + glib, + gobject-introspection, meson, ninja, pkg-config, wrapGAppsHook4, - libxml2, - python3Packages, - appstream, - glib, - cmake, - dbus, - systemd, bash, bindfs, + dbus, e2fsprogs, fakeroot, fuse, - gobject-introspection, + libadwaita, + libxml2, + systemd, unzip, + nix-update-script, }: -python3Packages.buildPythonApplication rec { - pname = "waydroid-helper"; +let version = "0.2.3"; - pyproject = false; # uses meson src = fetchFromGitHub { owner = "ayasa520"; @@ -35,6 +33,11 @@ python3Packages.buildPythonApplication rec { tag = "v${version}"; hash = "sha256-QxtCxujf7S3YRx/4rRMecFBomP+9tqrIBdYhc3WQT20="; }; +in +python3Packages.buildPythonApplication { + pname = "waydroid-helper"; + inherit version src; + pyproject = false; # uses meson postPatch = '' substituteInPlace dbus/meson.build \ @@ -45,39 +48,41 @@ python3Packages.buildPythonApplication rec { --replace-fail ": systemd_user_unit_dir" ": '$out/lib/systemd/user'" substituteInPlace systemd/{system/waydroid-mount,user/waydroid-monitor}.service \ --replace-fail "/usr/bin/waydroid-helper" "$out/bin/waydroid-helper" - # com.jaoushingan.WaydroidHelper.desktop: component-name-missing, description-first-para-too-short - # url-homepage-missing, desktop-app-launchable-omitted, content-rating-missing, developer-info-missing + '' + # com.jaoushingan.WaydroidHelper.desktop: component-name-missing, description-first-para-too-short + # url-homepage-missing, desktop-app-launchable-omitted, content-rating-missing, developer-info-missing + + '' sed -i '/test(/{N;/Validate appstream file/!b;:a;N;/)/!ba;d}' data/meson.build ''; nativeBuildInputs = [ appstream - glib cmake + desktop-file-utils + glib + gobject-introspection meson ninja pkg-config wrapGAppsHook4 - desktop-file-utils - gobject-introspection ]; buildInputs = [ - libxml2 - libadwaita - dbus bash + dbus + libadwaita + libxml2 systemd ]; dontUseCmakeConfigure = true; dependencies = with python3Packages; [ - pygobject3 - httpx - pyyaml aiofiles dbus-python + httpx + pygobject3 + pyyaml ]; strictDeps = true; @@ -104,12 +109,12 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = nix-update-script { }; meta = { + changelog = "https://github.com/ayasa520/waydroid-helper/releases/tag/${src.tag}"; description = "User-friendly way to configure Waydroid and install extensions, including Magisk and ARM translation"; homepage = "https://github.com/ayasa520/waydroid-helper"; - changelog = "https://github.com/ayasa520/waydroid-helper/releases/tag/${src.tag}"; - mainProgram = "waydroid-helper"; - platforms = lib.platforms.linux; license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "waydroid-helper"; maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; }