diff options
| author | Jonas Heinrich <onny@project-insanity.org> | 2023-01-25 11:07:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 11:07:05 +0100 |
| commit | 5ca9d1495248e252cacd2d226bcbd4a78d5c68bc (patch) | |
| tree | f8bb5d44e905ed19a346f691af6d04ef03ba2a8b /pkgs | |
| parent | f8693d82fc6b725f3d40bb33f440a427c4c028bb (diff) | |
| parent | 1b00e5af2fdff56affeb1f2c00db5b035c08fdcc (diff) | |
Merge pull request #212215 from samueldr/fix/waydroid-deps
waydroid: Add missing ambiant dependencies
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/waydroid/default.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index efa21cfb26b57..8955bcfa5126b 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -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 ]} |