chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-11 18:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

python3Packages.gbinder-python: 1.1.2 -> 1.3.0, waydroid: 1.5.4 -> 1.6.1, nixos/waydroid: fix systemd service (#475786)

Browse Source
This commit is contained in:
Sizhe Zhao
2026-01-01 08:36:29 +00:00
committed by GitHub
parent 2e18800d8e a19b015319
commit 9e8a791e22
3 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/virtualisation/waydroid.nix
View File

@@ -66,7 +66,7 @@ in
serviceConfig = {
Type = "dbus";
UMask = "0022";
ExecStart = "${cfg.package}/bin/waydroid -w container start";
ExecStart = "${cfg.package}/bin/waydroid container start";
BusName = "id.waydro.Container";
};
};

28
pkgs/by-name/wa/waydroid/package.nix
View File

@@ -1,7 +1,6 @@
{
lib,
fetchFromGitHub,
fetchpatch,
python3Packages,
dnsmasq,
gawk,
@@ -23,24 +22,16 @@
python3Packages.buildPythonApplication rec {
pname = "waydroid";
version = "1.5.4";
version = "1.6.1";
format = "other";
src = fetchFromGitHub {
owner = "waydroid";
repo = "waydroid";
tag = version;
hash = "sha256-K4uJ9MVmr5+7O1em1yUJXZj6H8bpfm2ZAE2uqgiyDBQ=";
hash = "sha256-2ywAgWYMQ7N2P4x/0maNUSn3pdaRAWyATaraRAGafxI=";
};
patches = [
(fetchpatch {
url = "https://github.com/waydroid/waydroid/commit/af296c90a788dde0b33813b12607cfab2fa65b98.patch";
hash = "sha256-1vkEKk00dbBLbbBxZIhcoOYUP976SJlaWyzYSWBy0nU=";
revert = true;
})
];
nativeBuildInputs = [
gobject-introspection
wrapGAppsHook3
@@ -63,14 +54,11 @@ python3Packages.buildPythonApplication rec {
dontWrapGApps = true;
installFlags = [
"PREFIX=$(out)"
"PREFIX=${placeholder "out"}"
"USE_SYSTEMD=0"
"SYSCONFDIR=$(out)/etc"
];
postInstall = lib.optionalString withNftables ''
substituteInPlace $out/lib/waydroid/data/scripts/waydroid-net.sh \
--replace-fail 'LXC_USE_NFT="false"' 'LXC_USE_NFT="true"'
'';
"SYSCONFDIR=${placeholder "out"}/etc"
]
++ lib.optional withNftables "USE_NFTABLES=1";
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
@@ -102,8 +90,8 @@ python3Packages.buildPythonApplication rec {
)
}"
substituteInPlace $out/lib/waydroid/tools/helpers/*.py \
--replace '"sh"' '"${runtimeShell}"'
substituteInPlace $out/lib/waydroid/tools/helpers/run.py $out/lib/waydroid/tools/helpers/lxc.py \
--replace-fail '"sh"' '"${runtimeShell}"'
'';
passthru.updateScript = nix-update-script { };

13
pkgs/development/python-modules/gbinder-python/default.nix
View File

@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "gbinder-python";
version = "1.1.2";
version = "1.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "erfanoabdi";
owner = "waydroid";
repo = "gbinder-python";
tag = version;
hash = "sha256-up1EDuR05a7TlCErd2BXkp01oqi6hEskt7xVxsJqquM=";
hash = "sha256-z0hMAvwB+uttPcP+in+C3o1ujhFSiDXKktOajnsXhPI=";
};
build-system = [
@@ -34,14 +34,13 @@ buildPythonPackage rec {
postPatch = ''
# Fix pkg-config name for cross-compilation
substituteInPlace setup.py \
--replace-fail "pkg-config" "$PKG_CONFIG" \
--replace-fail "USE_CYTHON = False" "USE_CYTHON = True"
--replace-fail "pkg-config" "$PKG_CONFIG"
'';
meta = {
description = "Python bindings for libgbinder";
homepage = "https://github.com/erfanoabdi/gbinder-python";
license = lib.licenses.gpl3;
homepage = "https://github.com/waydroid/gbinder-python";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = [ ];
};