diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-11-20 17:10:00 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-11-20 17:10:00 +0000 |
| commit | ab61e5b40d3f91bea5e14edbfcb7abb4ff8d9998 (patch) | |
| tree | bc75bc8bc280d52d2f2ab43516b116965cbd21c0 /pkgs/stdenv | |
| parent | be4dfd41be8f9de5d5ad57c398e4e46a9fa7584a (diff) | |
| download | nixlib-ab61e5b40d3f91bea5e14edbfcb7abb4ff8d9998.tar nixlib-ab61e5b40d3f91bea5e14edbfcb7abb4ff8d9998.tar.gz nixlib-ab61e5b40d3f91bea5e14edbfcb7abb4ff8d9998.tar.bz2 nixlib-ab61e5b40d3f91bea5e14edbfcb7abb4ff8d9998.tar.lz nixlib-ab61e5b40d3f91bea5e14edbfcb7abb4ff8d9998.tar.xz nixlib-ab61e5b40d3f91bea5e14edbfcb7abb4ff8d9998.tar.zst nixlib-ab61e5b40d3f91bea5e14edbfcb7abb4ff8d9998.zip | |
stdenv: Let GNU tar select the decompression method.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18492
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ac0a0b69e64d..62d441439d88 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -418,15 +418,11 @@ unpackFile() { header "unpacking source archive $curSrc" 3 case "$curSrc" in - *.tar) + *.tar | *.tar.* | *.tgz | *.tbz2) + # GNU tar can automatically select the decompression method + # (info "(tar) gzip"). tar xvf $curSrc ;; - *.tar.gz | *.tgz | *.tar.Z) - gzip -d < $curSrc | tar xvf - - ;; - *.tar.bz2 | *.tbz2) - bzip2 -d < $curSrc | tar xvf - - ;; *.zip) unzip $curSrc ;; |