swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #286721: stdenv: fix rare tar.xz decompression issues

Browse source 
...into staging
This commit is contained in:
Vladimír Čunát 2024-02-17 08:45:01 +01:00
parent 50b5b5b529 11a19109b6
commit eff11adc57
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/stdenv/generic/setup.sh
View file

@ -1065,7 +1065,11 @@ _defaultUnpack() {
# stages. The XZ_OPT env var is only used by the full "XZ utils" implementation, which supports
# the --threads (-T) flag. This allows us to enable multithreaded decompression exclusively on
# that implementation, without the use of complex bash conditionals and checks.
XZ_OPT="--threads=$NIX_BUILD_CORES" xz -d < "$fn" | tar xf - --warning=no-timestamp
# Since tar does not control the decompression, we need to
# disregard the error code from the xz invocation. Otherwise,
# it can happen that tar exits earlier, causing xz to fail
# from a SIGPIPE.
(XZ_OPT="--threads=$NIX_BUILD_CORES" xz -d < "$fn"; true) | tar xf - --warning=no-timestamp
;;
*.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz)
# GNU tar can automatically select the decompression method