From 107574ad650e047780bfe7cd386e65a930798cef Mon Sep 17 00:00:00 2001 From: George Huebner Date: Wed, 9 Jul 2025 14:24:50 -0400 Subject: [PATCH] one_gadget: use multiarch binutils The version of objdump used should support {i686,x86_64,aarch64}-linux-gnu, regardless of the host architecture (e.g. darwin). --- pkgs/by-name/on/one_gadget/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/one_gadget/package.nix b/pkgs/by-name/on/one_gadget/package.nix index d03d231e3744..3432638aa3b4 100644 --- a/pkgs/by-name/on/one_gadget/package.nix +++ b/pkgs/by-name/on/one_gadget/package.nix @@ -1,6 +1,6 @@ { lib, - binutils, + binutils-unwrapped, bundlerApp, bundlerUpdateScript, makeWrapper, @@ -14,7 +14,9 @@ bundlerApp { nativeBuildInputs = [ makeWrapper ]; postBuild = '' - wrapProgram $out/bin/one_gadget --prefix PATH : ${binutils}/bin + wrapProgram $out/bin/one_gadget --prefix PATH : ${ + binutils-unwrapped.override { withAllTargets = true; } + }/bin ''; passthru.updateScript = bundlerUpdateScript "one_gadget";