Unverified Commit 7f729db6 authored by Markus Theil's avatar Markus Theil
Browse files

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: default avatarMarkus Theil <theil.markus@gmail.com>
parent 7d5b1961

pkgs/by-name/rs/rshim-user-space/package.nix

+23 −8
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  fetchFromGitHub,

  autoconf,

  automake,

  bashNonInteractive,

  coreutils,

  fetchFromGitHub,

  fuse,

  gawk,

  gnugrep,

  gnused,

  lib,

  libusb1,

  makeBinaryWrapper,

  pkg-config,

  pciutils,

  libusb1,

  fuse,

  busybox,

  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

        ]

      }

  '';