From e7d7dc0da11ce0dc4ea6886dc23eae655f418e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 5 Sep 2024 15:39:07 -0400
Subject: [PATCH 1/5] waydroid: move to by-name

---
 .../waydroid/default.nix => by-name/wa/waydroid/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{os-specific/linux/waydroid/default.nix => by-name/wa/waydroid/package.nix} (100%)

diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/by-name/wa/waydroid/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/waydroid/default.nix
rename to pkgs/by-name/wa/waydroid/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c77d940eb55a231..078b4b3903d65f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3840,8 +3840,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
-  waydroid = callPackage ../os-specific/linux/waydroid { };
-
   wgo = callPackage ../development/tools/wgo { };
 
   wiiload = callPackage ../development/tools/wiiload { };

From 223081157ba784fa2807c03759bb69976374f275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 5 Sep 2024 15:39:32 -0400
Subject: [PATCH 2/5] waydroid: nixfmt

---
 pkgs/by-name/wa/waydroid/package.nix | 68 +++++++++++++++++-----------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index 5e29b911ca54883..ad6ed0daa85e287 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -1,20 +1,21 @@
-{ lib
-, fetchFromGitHub
-, fetchpatch
-, python3Packages
-, dnsmasq
-, gawk
-, getent
-, gobject-introspection
-, gtk3
-, kmod
-, lxc
-, iproute2
-, iptables
-, util-linux
-, wrapGAppsHook3
-, wl-clipboard
-, runtimeShell
+{
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  python3Packages,
+  dnsmasq,
+  gawk,
+  getent,
+  gobject-introspection,
+  gtk3,
+  kmod,
+  lxc,
+  iproute2,
+  iptables,
+  util-linux,
+  wrapGAppsHook3,
+  wl-clipboard,
+  runtimeShell,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -68,17 +69,30 @@ python3Packages.buildPythonApplication rec {
 
     patchShebangs --host $out/lib/waydroid/data/scripts
     wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \
-      --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables ]}
+      --prefix PATH ":" ${
+        lib.makeBinPath [
+          dnsmasq
+          getent
+          iproute2
+          iptables
+        ]
+      }
 
-    wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " ([
-      "$out"
-    ] ++ propagatedBuildInputs ++ [
-      gawk
-      kmod
-      lxc
-      util-linux
-      wl-clipboard
-    ])}"
+    wrapPythonProgramsIn $out/lib/waydroid/ "${
+      lib.concatStringsSep " " (
+        [
+          "$out"
+        ]
+        ++ propagatedBuildInputs
+        ++ [
+          gawk
+          kmod
+          lxc
+          util-linux
+          wl-clipboard
+        ]
+      )
+    }"
 
     substituteInPlace $out/lib/waydroid/tools/helpers/*.py \
       --replace '"sh"' '"${runtimeShell}"'

From bfc0c906d5f9207f6959183f28fe8e305f140be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 5 Sep 2024 15:41:23 -0400
Subject: [PATCH 3/5] waydroid: modernise

---
 pkgs/by-name/wa/waydroid/package.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index ad6ed0daa85e287..2de20c48185067d 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -24,10 +24,10 @@ python3Packages.buildPythonApplication rec {
   format = "other";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-/dFvhiK3nCOOmAtrYkQEB8Ge8Rf1ea5cDO7puTwS5bI=";
+    owner = "waydroid";
+    repo = "waydroid";
+    rev = "refs/tags/${version}";
+    hash = "sha256-/dFvhiK3nCOOmAtrYkQEB8Ge8Rf1ea5cDO7puTwS5bI=";
   };
 
   patches = [
@@ -60,9 +60,10 @@ python3Packages.buildPythonApplication rec {
   dontWrapPythonPrograms = true;
   dontWrapGApps = true;
 
-  installPhase = ''
-    make install PREFIX=$out USE_SYSTEMD=0
-  '';
+  installFlags = [
+    "PREFIX=$(out)"
+    "USE_SYSTEMD=0"
+  ];
 
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
@@ -99,10 +100,10 @@ python3Packages.buildPythonApplication rec {
   '';
 
   meta = {
-    description = "Waydroid is a container-based approach to boot a full Android system on a regular GNU/Linux system like Ubuntu";
+    description = "Container-based approach to boot a full Android system on a regular GNU/Linux system";
     mainProgram = "waydroid";
     homepage = "https://github.com/waydroid/waydroid";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ mcaju ];
   };

From 6af4b450a7980a03f29c54f418cad76d85cc4cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 5 Sep 2024 15:44:07 -0400
Subject: [PATCH 4/5] waydroid: set updateScript

---
 pkgs/by-name/wa/waydroid/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index 2de20c48185067d..5a7b528ef25babd 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -16,6 +16,7 @@
   wrapGAppsHook3,
   wl-clipboard,
   runtimeShell,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -99,6 +100,8 @@ python3Packages.buildPythonApplication rec {
       --replace '"sh"' '"${runtimeShell}"'
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Container-based approach to boot a full Android system on a regular GNU/Linux system";
     mainProgram = "waydroid";

From a4ee635c8b29a37b2358240df6031696b1ec5cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 5 Sep 2024 15:45:17 -0400
Subject: [PATCH 5/5] waydroid: 1.4.2 -> 1.4.3

---
 pkgs/by-name/wa/waydroid/package.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index 5a7b528ef25babd..8ea14e4b7c37726 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -21,24 +21,16 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "waydroid";
-  version = "1.4.2";
+  version = "1.4.3";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "waydroid";
     repo = "waydroid";
     rev = "refs/tags/${version}";
-    hash = "sha256-/dFvhiK3nCOOmAtrYkQEB8Ge8Rf1ea5cDO7puTwS5bI=";
+    hash = "sha256-LejyuGYgW46++95XROuWc13Q+w0l+AzGAl9ekfmAIEk=";
   };
 
-  patches = [
-    # https://github.com/waydroid/waydroid/pull/1218
-    (fetchpatch {
-      url = "https://github.com/waydroid/waydroid/commit/595e0e5b309a79fedaa07d90b9073ddcb156314c.patch";
-      hash = "sha256-A+rUmJbFFhMZ5WpT+QBCTEcn82wJuvmi8Wbcsio41Nk=";
-    })
-  ];
-
   nativeBuildInputs = [
     gobject-introspection
     wrapGAppsHook3
@@ -64,6 +56,7 @@ python3Packages.buildPythonApplication rec {
   installFlags = [
     "PREFIX=$(out)"
     "USE_SYSTEMD=0"
+    "SYSCONFDIR=$(out)/etc"
   ];
 
   preFixup = ''