Merge pull request #219266 from AtaraxiaSjel/update/waydroid-1.4.0
waydroid: 1.3.4 -> 1.4.1
This commit is contained in:
commit
2469b92ed0
|
@ -11,7 +11,6 @@
|
||||||
, iproute2
|
, iproute2
|
||||||
, iptables
|
, iptables
|
||||||
, util-linux
|
, util-linux
|
||||||
, which
|
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, xclip
|
, xclip
|
||||||
, runtimeShell
|
, runtimeShell
|
||||||
|
@ -19,14 +18,14 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "waydroid";
|
pname = "waydroid";
|
||||||
version = "1.3.4";
|
version = "1.4.1";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-0GBob9BUwiE5cFGdK8AdwsTjTOdc+AIWqUGN/gFfOqI=";
|
sha256 = "sha256-0AkNzMIumvgnVcLKX72E2+Eg54Y9j7tdIYPsroOTLWA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -39,6 +38,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python3Packages; [
|
||||||
|
dbus-python
|
||||||
gbinder-python
|
gbinder-python
|
||||||
pyclip
|
pyclip
|
||||||
pygobject3
|
pygobject3
|
||||||
|
@ -63,6 +63,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
|
|
||||||
wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [
|
wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [
|
||||||
"$out"
|
"$out"
|
||||||
|
python3Packages.dbus-python
|
||||||
python3Packages.gbinder-python
|
python3Packages.gbinder-python
|
||||||
python3Packages.pygobject3
|
python3Packages.pygobject3
|
||||||
python3Packages.pyclip
|
python3Packages.pyclip
|
||||||
|
@ -70,15 +71,11 @@ python3Packages.buildPythonApplication rec {
|
||||||
kmod
|
kmod
|
||||||
lxc
|
lxc
|
||||||
util-linux
|
util-linux
|
||||||
which
|
|
||||||
xclip
|
xclip
|
||||||
]}"
|
]}"
|
||||||
|
|
||||||
substituteInPlace $out/lib/waydroid/tools/helpers/*.py \
|
substituteInPlace $out/lib/waydroid/tools/helpers/*.py \
|
||||||
--replace '"sh"' '"${runtimeShell}"'
|
--replace '"sh"' '"${runtimeShell}"'
|
||||||
|
|
||||||
substituteInPlace $out/share/applications/*.desktop \
|
|
||||||
--replace "/usr" "$out"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in a new issue