waydroid: 1.4.1 -> 1.4.2

Diff: https://github.com/waydroid/waydroid/compare/1.4.1...1.4.2
This commit is contained in:
Sandro Jäckel 2023-12-24 02:07:43 +01:00
parent 0fe31382c0
commit c238335625
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5

View File

@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
, fetchpatch
, python3Packages
, dnsmasq
, gawk
@ -12,24 +13,28 @@
, iptables
, util-linux
, wrapGAppsHook
, xclip
, wl-clipboard
, runtimeShell
}:
python3Packages.buildPythonApplication rec {
pname = "waydroid";
version = "1.4.1";
version = "1.4.2";
format = "other";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-0AkNzMIumvgnVcLKX72E2+Eg54Y9j7tdIYPsroOTLWA=";
sha256 = "sha256-/dFvhiK3nCOOmAtrYkQEB8Ge8Rf1ea5cDO7puTwS5bI=";
};
buildInputs = [
gtk3
patches = [
# https://github.com/waydroid/waydroid/pull/1218
(fetchpatch {
url = "https://github.com/waydroid/waydroid/commit/595e0e5b309a79fedaa07d90b9073ddcb156314c.patch";
hash = "sha256-A+rUmJbFFhMZ5WpT+QBCTEcn82wJuvmi8Wbcsio41Nk=";
})
];
nativeBuildInputs = [
@ -37,6 +42,10 @@ python3Packages.buildPythonApplication rec {
wrapGAppsHook
];
buildInputs = [
gtk3
];
propagatedBuildInputs = with python3Packages; [
dbus-python
gbinder-python
@ -61,18 +70,15 @@ python3Packages.buildPythonApplication rec {
wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \
--prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables ]}
wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [
wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " ([
"$out"
python3Packages.dbus-python
python3Packages.gbinder-python
python3Packages.pygobject3
python3Packages.pyclip
] ++ propagatedBuildInputs ++ [
gawk
kmod
lxc
util-linux
xclip
]}"
wl-clipboard
])}"
substituteInPlace $out/lib/waydroid/tools/helpers/*.py \
--replace '"sh"' '"${runtimeShell}"'