diff options
author | Gleb Peregud <gleber.p@gmail.com> | 2018-11-25 11:24:31 +0100 |
---|---|---|
committer | Renaud <c0bw3b@users.noreply.github.com> | 2018-11-25 11:24:31 +0100 |
commit | bea10bfcab52b43020f78b80921caaeec70767e9 (patch) | |
tree | df1deb9857bd35e0bf49d7be0639a65ec7fe537f /pkgs/tools/misc/woeusb | |
parent | d83c8f4616e1c472d3561223f97d751221830acd (diff) | |
download | nixlib-bea10bfcab52b43020f78b80921caaeec70767e9.tar nixlib-bea10bfcab52b43020f78b80921caaeec70767e9.tar.gz nixlib-bea10bfcab52b43020f78b80921caaeec70767e9.tar.bz2 nixlib-bea10bfcab52b43020f78b80921caaeec70767e9.tar.lz nixlib-bea10bfcab52b43020f78b80921caaeec70767e9.tar.xz nixlib-bea10bfcab52b43020f78b80921caaeec70767e9.tar.zst nixlib-bea10bfcab52b43020f78b80921caaeec70767e9.zip |
woeusb: add p7zip to runtime deps
* woeusb: add p7zip to runtime deps enable extra feature (#47982) WoeUSB depends on presence of '7z` binary in the path to execute an extra step. As Windows 7's installation media doesn't place the required EFI bootloaders in the right location, WoeUSB extracts them from the system image manually using '7z' binary which it checks with 'command -v 7z'. See related code at: https://github.com/slacka/WoeUSB/blob/aea4f91783d60fe092605cf26b996d1ba593f976/src/woeusb#L1530 * woeusb: split native build inputs
Diffstat (limited to 'pkgs/tools/misc/woeusb')
-rw-r--r-- | pkgs/tools/misc/woeusb/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 5232088ab1b1..f73aa4547993 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper -, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, utillinux, wget +, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, utillinux, wget , wxGTK30 }: stdenv.mkDerivation rec { @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0jzgwh9xv92yns5yi5zpl49zbp3csh6m6iclgq070awpjpsqlqi0"; }; - buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ wxGTK30 ]; postPatch = '' # Emulate version smudge filter (see .gitattributes, .gitconfig). @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { # should be patched with a less useless default PATH, but for now # we add everything we need manually. wrapProgram "$out/bin/woeusb" \ - --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget ]}' + --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget p7zip ]}' ''; doInstallCheck = true; |