From b6cd58e69d0571d6574f28acf8ceed03c90ac985 Mon Sep 17 00:00:00 2001
From: Tawsif Hossain Shafi <thshafi170@gmail.com>
Date: Sat, 21 Jun 2025 19:17:31 +0600
Subject: [PATCH] waydroid-helper: fix dependencies and `WrapperArgs` issues
 (#412027)

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
Co-authored-by: Shafa'el Zmeyev <shafael170@gmail.com>
---
 pkgs/by-name/wa/waydroid-helper/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix
index 6f7e609321a3..42dd8bda565a 100644
--- a/pkgs/by-name/wa/waydroid-helper/package.nix
+++ b/pkgs/by-name/wa/waydroid-helper/package.nix
@@ -16,6 +16,7 @@
   dbus,
   systemd,
   bash,
+  fakeroot,
   gobject-introspection,
 }:
 
@@ -41,8 +42,6 @@ python3Packages.buildPythonApplication rec {
     # 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
-    substituteInPlace waydroid_helper/waydroid-cli.in \
-      --replace-fail "/bin/bash" "${bash}/bin/bash"
   '';
 
   nativeBuildInputs = [
@@ -61,6 +60,7 @@ python3Packages.buildPythonApplication rec {
     libxml2
     libadwaita
     dbus
+    bash
     systemd
   ];
 
@@ -78,7 +78,10 @@ python3Packages.buildPythonApplication rec {
 
   dontWrapGApps = true;
 
-  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+  makeWrapperArgs = [
+    "\${gappsWrapperArgs[@]}"
+    "--prefix PATH : ${lib.makeBinPath [ fakeroot ]}"
+  ];
 
   postInstallCheck = ''
     mesonCheckPhase