diff options
| author | Mihai-Drosi Caju <cajum.bugs@yandex.com> | 2022-08-11 01:04:10 +0300 |
|---|---|---|
| committer | Mihai-Drosi Caju <cajum.bugs@yandex.com> | 2022-08-14 06:51:34 +0300 |
| commit | 328448a15306ef65319af532364d33cbe7bdf8cb (patch) | |
| tree | b459de9537a53c85d317de27d9135f13d68363ff /pkgs/os-specific/linux/waydroid | |
| parent | fae0b890bca98d5fc0c24d912c398b19261aa890 (diff) | |
waydroid: 1.2.1 -> 1.3.0
Diffstat (limited to 'pkgs/os-specific/linux/waydroid')
| -rw-r--r-- | pkgs/os-specific/linux/waydroid/default.nix | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index 0a0a4019e9839..c9298ecec4e27 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 |