diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-30 14:12:35 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-09 12:44:50 +0200 |
| commit | d7b356f73b41640f5ee741f004c4fb41e0471d30 (patch) | |
| tree | 06194c240798b1b342720b1bf406c346cac79f7c /pkgs/stdenv/generic/setup.sh | |
| parent | f97ee61255478e9ca683d1fb7c9fd777247293cb (diff) | |
| download | nixlib-d7b356f73b41640f5ee741f004c4fb41e0471d30.tar nixlib-d7b356f73b41640f5ee741f004c4fb41e0471d30.tar.gz nixlib-d7b356f73b41640f5ee741f004c4fb41e0471d30.tar.bz2 nixlib-d7b356f73b41640f5ee741f004c4fb41e0471d30.tar.lz nixlib-d7b356f73b41640f5ee741f004c4fb41e0471d30.tar.xz nixlib-d7b356f73b41640f5ee741f004c4fb41e0471d30.tar.zst nixlib-d7b356f73b41640f5ee741f004c4fb41e0471d30.zip | |
stdenv: Move unzip support to unzip's setup hook
Diffstat (limited to 'pkgs/stdenv/generic/setup.sh')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 9a756fd47235..e5fdbdf2d53b 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -489,23 +489,20 @@ addHook unpackCmd _defaultUnpack _defaultUnpack() { if [ -d "$curSrc" ]; then - stripHash $curSrc - cp -prd --no-preserve=timestamps $curSrc $strippedName + stripHash "$curSrc" + cp -prd --no-preserve=timestamps "$curSrc" $strippedName else case "$curSrc" in *.tar.xz | *.tar.lzma) # Don't rely on tar knowing about .xz. - xz -d < $curSrc | tar xf - + xz -d < "$curSrc" | tar xf - ;; *.tar | *.tar.* | *.tgz | *.tbz2) # GNU tar can automatically select the decompression method # (info "(tar) gzip"). - tar xf $curSrc - ;; - *.zip) - unzip -qq $curSrc + tar xf "$curSrc" ;; *) return 1 |