From 08b7d845bb617d9add7ba1b8a102cc2b8777ab8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Dec 2025 14:14:54 +0100 Subject: [PATCH 1/2] wrapGAppsNoGuiHook: fix cross usage Before it would fail like: networkd-dispatcher> Running phase: gappsWrapperArgsHook networkd-dispatcher> Running phase: fixupPhase networkd-dispatcher> Wrapping program '/nix/store/gl6mh6rxwdf2jahn285asqd2nf13c3sm-networkd-dispatcher-aarch64-unknown-linux-gnu-2.2.4/bin/networkd-dispatcher' networkd-dispatcher> /nix/store/6b7dnfcjbdmhw33j0pzhvz3599vdigbx-gcc-wrapper-14.3.0/bin/cc: line 273: /nix/store/l5dgbva6qgv631d22p08in1my589ssmp-gcc-14.3.0-aarch64-unknown-linux-gnu/bin/gcc: cannot execute binary file: Exec format error networkd-dispatcher> /nix/store/5wbhq6vqdjl2n1pzzw2q3lhgmm8v5d98-make-binary-wrapper-hook/nix-support/setup-hook: line 84: printf: Broken pipe networkd-dispatcher> /nix/store/5wbhq6vqdjl2n1pzzw2q3lhgmm8v5d98-make-binary-wrapper-hook/nix-support/setup-hook: line 84: printf: write error: Broken pipe --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d751f8a13b1..1cbfc30ebf36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -918,7 +918,7 @@ with pkgs; }; wrapGAppsNoGuiHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { - makeWrapper = makeBinaryWrapper; + makeWrapper = buildPackages.makeBinaryWrapper; }; separateDebugInfo = makeSetupHook { From 9079166f1294e97ebfa74e52a01fc25ee5b35bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Dec 2025 14:46:00 +0100 Subject: [PATCH 2/2] networkd-dispatcher: clean up checkInputs --- pkgs/by-name/ne/networkd-dispatcher/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/ne/networkd-dispatcher/package.nix b/pkgs/by-name/ne/networkd-dispatcher/package.nix index addb7879e2c4..15527a405e4f 100644 --- a/pkgs/by-name/ne/networkd-dispatcher/package.nix +++ b/pkgs/by-name/ne/networkd-dispatcher/package.nix @@ -57,10 +57,7 @@ stdenv.mkDerivation rec { ]; checkInputs = with python3Packages; [ - dbus-python - iw mock - pygobject3 pytestCheckHook ];