dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/os-specific/linux/waydroid/default.nix
View File

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