diff options
| author | Maciej Krüger <mkg20001@gmail.com> | 2023-12-25 10:35:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-25 10:35:04 +0100 |
| commit | 3e44a6d2f9e6edd5b46058b0ae4660764e645bea (patch) | |
| tree | f476a38c9e22086b8c8c735f6f175591a60947f0 /pkgs/os-specific | |
| parent | 6d5f8d56127739cacc57bccf314dce1b1de630b4 (diff) | |
| parent | c238335625e6892cf0c012db1c5f07032d246957 (diff) | |
Merge pull request #276409 from SuperSandro2000/waydroid
waydroid: 1.4.1 -> 1.4.2
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/waydroid/default.nix | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index e8e0727b8dbfa..97818ba9c4d49 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -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}"' |