Merge pull request #186565 from CajuM/waydroid-up
waydroid: 1.2.1 -> 1.3.0
This commit is contained in:
commit
f5c03fb855
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue