picnoir
/
nix-gh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add gzip support for channel unpacking

This commit is contained in:
Gergely Risko 2013-05-14 15:10:14 +02:00 committed by Eelco Dolstra
parent 620d57f036
commit 25a00cae5b
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -183,10 +183,10 @@ NEED_PROG(perl, perl)
NEED_PROG(sed, sed) NEED_PROG(sed, sed)
NEED_PROG(tar, tar) NEED_PROG(tar, tar)
NEED_PROG(bzip2, bzip2) NEED_PROG(bzip2, bzip2)
NEED_PROG(gzip, gzip)
NEED_PROG(xz, xz) NEED_PROG(xz, xz)
AC_PATH_PROG(dot, dot) AC_PATH_PROG(dot, dot)
AC_PATH_PROG(dblatex, dblatex) AC_PATH_PROG(dblatex, dblatex)
AC_PATH_PROG(gzip, gzip)
AC_PATH_PROG(pv, pv, pv) AC_PATH_PROG(pv, pv, pv)

1
corepkgs/config.nix.in
View File

@ -7,6 +7,7 @@ in {
shell = "@shell@"; shell = "@shell@";
coreutils = "@coreutils@"; coreutils = "@coreutils@";
bzip2 = "@bzip2@"; bzip2 = "@bzip2@";
gzip = "@gzip@";
xz = "@xz@"; xz = "@xz@";
tar = "@tar@"; tar = "@tar@";
tarFlags = "@tarFlags@"; tarFlags = "@tarFlags@";

7
corepkgs/unpack-channel.nix
View File

@ -6,9 +6,12 @@ let
'' ''
mkdir $out mkdir $out
cd $out cd $out
pat="\.xz\$" xzpat="\.xz\$"
if [[ "$src" =~ $pat ]]; then gzpat="\.gz\$"
if [[ "$src" =~ $xzpat ]]; then
${xz} -d < $src | ${tar} xf - ${tarFlags} ${xz} -d < $src | ${tar} xf - ${tarFlags}
else if [[ "$src" =~ $gzpat ]]; then
${gzip} -d < $src | ${tar} xf - ${tarFlags}
else else
${bzip2} -d < $src | ${tar} xf - ${tarFlags} ${bzip2} -d < $src | ${tar} xf - ${tarFlags}
fi fi

1
nix.spec.in
View File

@ -22,6 +22,7 @@ Requires: /usr/bin/perl
Requires: curl Requires: curl
Requires: perl-DBD-SQLite Requires: perl-DBD-SQLite
Requires: bzip2 Requires: bzip2
Requires: gzip
Requires: xz Requires: xz
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
BuildRequires: sqlite-devel BuildRequires: sqlite-devel