astro/nix-scripts
1
0
Fork 0
forked from M-Labs/nix-scripts
Code Issues Pull Requests Releases Wiki Activity

Override p7zip to fix build with nixpkgs >20.03

Browse Source
This commit is contained in:
adisbladis 2020-05-03 15:24:21 +01:00 committed by Stephan Maka
parent c147ddee56
commit 9e6775fe8d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
artiq-fast/windows/win.nix
View File

@ -14,8 +14,15 @@ let
qemu = pkgs.qemu_test; qemu = pkgs.qemu_test;
libguestfs = pkgs.libguestfs-with-appliance; libguestfs = pkgs.libguestfs-with-appliance;
# p7zip on >20.03 has known vulns but we have no better option
p7zip = pkgs.p7zip.overrideAttrs(old: {
meta = old.meta // {
knownVulnerabilities = [];
};
});
runQemuCommand = name: command: ( runQemuCommand = name: command: (
pkgs.runCommandNoCC name { buildInputs = [ pkgs.p7zip qemu libguestfs ]; } pkgs.runCommandNoCC name { buildInputs = [ p7zip qemu libguestfs ]; }
( (
'' ''
if ! test -f; then if ! test -f; then
@ -142,8 +149,8 @@ let
in in
'' ''
#!${pkgs.runtimeShell} #!${pkgs.runtimeShell}
set -exuo pipefail set -euxo pipefail
export PATH=${lib.makeBinPath [ pkgs.p7zip qemu libguestfs ]}:$PATH export PATH=${lib.makeBinPath [ p7zip qemu libguestfs ]}:$PATH
# Create a bootable "USB" image # Create a bootable "USB" image
# Booting in USB mode circumvents the "press any key to boot from cdrom" prompt # Booting in USB mode circumvents the "press any key to boot from cdrom" prompt