From d3549446468027c5f37f318b038da9b6d80c8710 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 7 Dec 2025 13:29:49 -0800 Subject: [PATCH] networkd-dispatcher: fix cross `wrapPython` does not work in the cross-compilation case, since we need a python interpreter that target `stdenv.hostPlatform`. --- .../ne/networkd-dispatcher/package.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ne/networkd-dispatcher/package.nix b/pkgs/by-name/ne/networkd-dispatcher/package.nix index 486551ce0f6a..5c2003027f81 100644 --- a/pkgs/by-name/ne/networkd-dispatcher/package.nix +++ b/pkgs/by-name/ne/networkd-dispatcher/package.nix @@ -5,6 +5,7 @@ fetchpatch, installShellFiles, python3Packages, + python3, asciidoc, wrapGAppsNoGuiHook, iw, @@ -46,10 +47,14 @@ stdenv.mkDerivation rec { asciidoc # for a2x installShellFiles wrapGAppsNoGuiHook - python3Packages.wrapPython ]; - dontWrapGApps = true; + buildInputs = [ + (python3.withPackages (ps: [ + ps.dbus-python + ps.pygobject3 + ])) + ]; checkInputs = with python3Packages; [ dbus-python @@ -59,14 +64,10 @@ stdenv.mkDerivation rec { pytestCheckHook ]; - pythonPath = with python3Packages; [ - dbus-python - pygobject3 - ]; - installPhase = '' runHook preInstall install -D -m755 -t $out/bin networkd-dispatcher + patchShebangs --host $out/bin/networkd-dispatcher install -Dm644 networkd-dispatcher.service $out/lib/systemd/system/networkd-dispatcher.service install -Dm644 networkd-dispatcher.conf $out/etc/conf.d/networkd-dispatcher.conf installManPage networkd-dispatcher.8 @@ -76,13 +77,7 @@ stdenv.mkDerivation rec { doCheck = true; preFixup = '' - makeWrapperArgs+=( \ - "''${gappsWrapperArgs[@]}" \ - --prefix PATH : "${lib.makeBinPath [ iw ]}" \ - ) - ''; - postFixup = '' - wrapPythonPrograms + gappsWrapperArgs+=("--prefix" "PATH" ":" "${lib.makeBinPath [ iw ]}") ''; meta = with lib; {