From ab61e5b40d3f91bea5e14edbfcb7abb4ff8d9998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 20 Nov 2009 17:10:00 +0000
Subject: [PATCH] stdenv: Let GNU tar select the decompression method.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18492
---
 pkgs/stdenv/generic/setup.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index ac0a0b69e64..62d441439d8 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
             ;;