Merge pull request #145143 from CajuM/waydroid

waydroid: 1.1.1 -> 1.2.0

pkgs/os-specific/linux/waydroid/default.nix

···
 , fetchFromGitHub
 , python3Packages
 , dnsmasq
+, getent
+, kmod
 , lxc
+, iproute2
+, iptables
 , nftables
-, python
+, util-linux
+, which
+, xclip
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "waydroid";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "0cabh7rysh2v15wrxg250370mw26s5d073yxmczxsarbp4ri2pl4";
+    sha256 = "03d87sh443kn0j2mpih1g909khkx3wgb04h605f9jhd0znskkbmw";
   };
 
   propagatedBuildInputs = with python3Packages; [
     gbinder-python
+    pyclip
     pygobject3
   ];
 
···
 
     cp -ra data $out/${python3Packages.python.sitePackages}/data
     wrapProgram $out/${python3Packages.python.sitePackages}/data/scripts/waydroid-net.sh \
-       --prefix PATH ":" ${lib.makeBinPath [ dnsmasq nftables ]}
+       --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} "$out ${python3Packages.gbinder-python} ${python3Packages.pygobject3} ${lxc}"
+    wrapPythonProgramsIn $out/${python3Packages.python.sitePackages} "${lib.concatStringsSep " " [
+      "$out"
+      python3Packages.gbinder-python
+      python3Packages.pygobject3
+      python3Packages.pyclip
+      kmod
+      lxc
+      util-linux
+      which
+      xclip
+    ]}"
   '';
 
   meta = with lib; {
-    description = "Waydroid is a container-based approach to boot a full Android system on a regular GNU/Linux system like Ubuntu.";
+    description = "Waydroid is a container-based approach to boot a full Android system on a regular GNU/Linux system like Ubuntu";
     homepage = "https://github.com/waydroid/waydroid";
     license = licenses.gpl3;
     platforms = platforms.linux;