From 7f729db61426da23eeb306e5456d114118ed1c7c Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Mon, 18 Aug 2025 11:04:04 +0200 Subject: [PATCH] rshim-user-space: drop busybox dependency With the current busybox runtime dependency, we ran into issues originated in busybox being more minimal than the full component. Example: [root@nixos:~]# bfb-install -r rshim0 -b installer.bfb Checking if local host has root access... lspci: invalid option -- 's' BusyBox v1.36.1 () multi-call binary. Usage: lspci [-mk] List all PCI devices -m Parsable output -k Show driver Checking if rshim driver is running locally... Fix this by using the "full" dependency versions. Signed-off-by: Markus Theil --- pkgs/by-name/rs/rshim-user-space/package.nix | 33 ++++++++++++++------ 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/rs/rshim-user-space/package.nix b/pkgs/by-name/rs/rshim-user-space/package.nix index db830029690e..5422e9ce5068 100644 --- a/pkgs/by-name/rs/rshim-user-space/package.nix +++ b/pkgs/by-name/rs/rshim-user-space/package.nix @@ -1,16 +1,23 @@ { - stdenv, - lib, - fetchFromGitHub, autoconf, automake, - makeBinaryWrapper, - pkg-config, - pciutils, - libusb1, + bashNonInteractive, + coreutils, + fetchFromGitHub, fuse, - busybox, + gawk, + gnugrep, + gnused, + lib, + libusb1, + makeBinaryWrapper, + pciutils, + pkg-config, + procps, pv, + stdenv, + which, + util-linux, withBfbInstall ? true, }: @@ -58,8 +65,16 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bfb-install \ --set PATH ${ lib.makeBinPath [ - busybox + bashNonInteractive + coreutils + gawk + gnugrep + gnused + pciutils + procps pv + util-linux + which ] } '';