diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-16 12:53:32 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-16 12:53:32 +0100 |
commit | 67419f0e56f99b0ebbe14574d3492110ac84c8d6 (patch) | |
tree | 3abc8e1606a2c80b6f5d14fef175e50800202163 /nixpkgs/pkgs/tools/misc/rshim-user-space | |
parent | a2c1eff83c3118a9aee8076c7f84f58137416b6e (diff) | |
parent | 9008bc4eb62c878d0812105ea1b34255d651df88 (diff) | |
download | nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.gz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.bz2 nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.lz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.xz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.zst nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into HEAD
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/rshim-user-space')
-rw-r--r-- | nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix b/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix index 79b795f869a3..25550f45c4fa 100644 --- a/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix +++ b/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix @@ -3,10 +3,14 @@ , fetchFromGitHub , autoconf , automake +, makeBinaryWrapper , pkg-config , pciutils , libusb1 , fuse +, busybox +, pv +, withBfbInstall ? true }: stdenv.mkDerivation rec { @@ -24,7 +28,7 @@ stdenv.mkDerivation rec { autoconf automake pkg-config - ]; + ] ++ lib.optionals withBfbInstall [ makeBinaryWrapper ]; buildInputs = [ pciutils @@ -39,6 +43,13 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/bin cp -a src/rshim "$out"/bin/ + '' + lib.optionalString withBfbInstall '' + cp -a scripts/bfb-install "$out"/bin/ + ''; + + postFixup = lib.optionalString withBfbInstall '' + wrapProgram $out/bin/bfb-install \ + --set PATH ${lib.makeBinPath [ busybox pv ]} ''; meta = with lib; { |