diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix index c997c37425a1..828e9caf19c9 100644 --- a/pkgs/by-name/wa/waydroid-helper/package.nix +++ b/pkgs/by-name/wa/waydroid-helper/package.nix @@ -17,22 +17,22 @@ android-tools, e2fsprogs, fakeroot, - fuse, libadwaita, libxml2, systemd, unzip, nix-update-script, + fetchpatch, }: let - version = "0.2.7"; + version = "0.2.9"; src = fetchFromGitHub { owner = "ayasa520"; repo = "waydroid-helper"; tag = "v${version}"; - hash = "sha256-I8DwaPQQz4eSyuTCwkbidhXACfpdOYcmGjP7d03DIU0="; + hash = "sha256-6mVb4GPD2NCsvyaqQAOFox0rNIlyOttiaZKbHBS40Rg="; }; in python3Packages.buildPythonApplication { @@ -40,6 +40,15 @@ python3Packages.buildPythonApplication { inherit version src; pyproject = false; # uses meson + patches = [ + # remove for next release + (fetchpatch { + name = "USE_UMOUNT_NOT_FUSERMOUNT"; + url = "https://github.com/waydroid-helper/waydroid-helper/commit/eb8ccf7a276f95b31972edbd063245704b2b5b2e.patch"; + hash = "sha256-z0PWBZTox3RpPCm8/fGYEukU0v41U7/TFcYE0Ec5Zeg="; + }) + ]; + postPatch = '' substituteInPlace dbus/meson.build \ --replace-fail "dbus_policy_dir," "'$out/share/dbus-1/system.d'," \ @@ -99,7 +108,6 @@ python3Packages.buildPythonApplication { bindfs e2fsprogs fakeroot - fuse unzip ] }"