ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

woeusb: add p7zip to runtime deps

Browse Source 
* 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:
aea4f91783/src/woeusb (L1530)

* woeusb: split native build inputs
This commit is contained in:
Gleb Peregud 2018-11-25 11:24:31 +01:00 committed by Renaud
parent d83c8f4616
commit bea10bfcab
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/misc/woeusb/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper { 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 }: , wxGTK30 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "0jzgwh9xv92yns5yi5zpl49zbp3csh6m6iclgq070awpjpsqlqi0"; sha256 = "0jzgwh9xv92yns5yi5zpl49zbp3csh6m6iclgq070awpjpsqlqi0";
}; };
buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; nativeBuildInputs = [ autoreconfHook makeWrapper ];
buildInputs = [ wxGTK30 ];
postPatch = '' postPatch = ''
# Emulate version smudge filter (see .gitattributes, .gitconfig). # 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 # should be patched with a less useless default PATH, but for now
# we add everything we need manually. # we add everything we need manually.
wrapProgram "$out/bin/woeusb" \ 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; doInstallCheck = true;