summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-05-26 07:06:13 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-05-26 08:07:05 +0000
commit6fd97eadd7d64fa4b11cb6a758015a7b28d4b95e (patch)
tree4983eff63870cba1a5aac0020f98141c50c6c9ba
parentMerge pull request #174622 from NixOS/backport-174491-to-release-22.05 (diff)
downloadnixpkgs-origin/backport-174689-to-release-22.05.tar.gz
compressFirmwareXz: fix with empty lib/firmwareorigin/backport-174689-to-release-22.05
Fixes: 8aa8e0ce7f1 ("nixos/udev: compress all firmware if supported") (cherry picked from commit 76405e3077eaf84e33fb61e11292d859fa1d0d9c)
-rw-r--r--pkgs/build-support/kernel/compress-firmware-xz.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix
index 56595131c891..6a797226aa67 100644
--- a/pkgs/build-support/kernel/compress-firmware-xz.nix
+++ b/pkgs/build-support/kernel/compress-firmware-xz.nix
@@ -7,7 +7,7 @@ runCommand "${firmware.name}-xz" {} ''
(cd ${firmware} && find lib/firmware -type d -print0) |
(cd $out && xargs -0 mkdir -v --)
(cd ${firmware} && find lib/firmware -type f -print0) |
- (cd $out && xargs -0tP "$NIX_BUILD_CORES" -n1 \
+ (cd $out && xargs -0rtP "$NIX_BUILD_CORES" -n1 \
sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --)
(cd ${firmware} && find lib/firmware -type l) | while read link; do
target="$(readlink "${firmware}/$link")"