Merge pull request #212215 from samueldr/fix/waydroid-deps

waydroid: Add missing ambiant dependencies
This commit is contained in:
Jonas Heinrich 2023-01-25 11:07:05 +01:00 committed by GitHub
commit 5ca9d14952
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,12 +4,15 @@
, dnsmasq
, gawk
, getent
, gobject-introspection
, gtk3
, kmod
, lxc
, iproute2
, nftables
, util-linux
, which
, wrapGAppsHook
, xclip
}:
@ -25,6 +28,15 @@ python3Packages.buildPythonApplication rec {
sha256 = "sha256-0GBob9BUwiE5cFGdK8AdwsTjTOdc+AIWqUGN/gFfOqI=";
};
buildInputs = [
gtk3
];
nativeBuildInputs = [
gobject-introspection
wrapGAppsHook
];
propagatedBuildInputs = with python3Packages; [
gbinder-python
pyclip
@ -35,9 +47,14 @@ python3Packages.buildPythonApplication rec {
dontUsePipInstall = true;
dontUseSetuptoolsCheck = true;
dontWrapPythonPrograms = true;
dontWrapGApps = true;
installPhase = ''
make install PREFIX=$out USE_SYSTEMD=0 USE_NFTABLES=1
'';
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \
--prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]}