From 328448a15306ef65319af532364d33cbe7bdf8cb Mon Sep 17 00:00:00 2001
From: Mihai-Drosi Caju <cajum.bugs@yandex.com>
Date: Thu, 11 Aug 2022 01:04:10 +0300
Subject: [PATCH] waydroid: 1.2.1 -> 1.3.0

---
 pkgs/os-specific/linux/waydroid/default.nix | 25 +++++----------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix
index 0a0a4019e983..c9298ecec4e2 100644
--- a/pkgs/os-specific/linux/waydroid/default.nix
+++ b/pkgs/os-specific/linux/waydroid/default.nix
@@ -16,13 +16,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "waydroid";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-Sf1rl8GCSTuneuYroGqsm9Aq2rBurpyswOrfCq2mWOs=";
+    sha256 = "sha256-6osDGYyFuyPDeK1QFowh414j3laD8i4bqPgCeJmsszE=";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -37,25 +37,12 @@ python3Packages.buildPythonApplication rec {
   dontWrapPythonPrograms = true;
 
   installPhase = ''
-    mkdir -p $out/${python3Packages.python.sitePackages}
+    make install DESTDIR=$out PREFIX= USE_SYSTEMD=0 USE_NFTABLES=1
 
-    cp -ra tools $out/${python3Packages.python.sitePackages}/tools
+    wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \
+       --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]}
 
-    cp -ra data $out/${python3Packages.python.sitePackages}/data
-    wrapProgram $out/${python3Packages.python.sitePackages}/data/scripts/waydroid-net.sh \
-       --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables nftables ]}
-
-    mkdir -p $out/share/waydroid/gbinder.d
-    cp gbinder/anbox.conf $out/share/waydroid/gbinder.d/anbox.conf
-
-    mkdir -p $out/share/applications
-    ln -s $out/${python3Packages.python.sitePackages}/data/Waydroid.desktop $out/share/applications/Waydroid.desktop
-
-    mkdir $out/bin
-    cp -a waydroid.py $out/${python3Packages.python.sitePackages}/waydroid.py
-    ln -s $out/${python3Packages.python.sitePackages}/waydroid.py $out/bin/waydroid
-
-    wrapPythonProgramsIn $out/${python3Packages.python.sitePackages} "${lib.concatStringsSep " " [
+    wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [
       "$out"
       python3Packages.gbinder-python
       python3Packages.pygobject3