mirror of
https://github.com/NixOS/nix.git
synced 2024-11-25 16:23:02 +00:00
Use a GNU tar flag to shut up warnings about implausibly old timestamp
This commit is contained in:
parent
afa7e01878
commit
46f852cda0
12
configure.ac
12
configure.ac
@ -339,6 +339,18 @@ eval dynlib_suffix=$shrext_cmds
|
|||||||
AC_SUBST(dynlib_suffix)
|
AC_SUBST(dynlib_suffix)
|
||||||
|
|
||||||
|
|
||||||
|
# Do we have GNU tar?
|
||||||
|
AC_MSG_CHECKING([if you have GNU tar])
|
||||||
|
if $tar --version 2> /dev/null | grep -q GNU; then
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
tarFlags="--warning=no-timestamp"
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
fi
|
||||||
|
AC_SUBST(tarFlags)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
AM_CONFIG_HEADER([config.h])
|
AM_CONFIG_HEADER([config.h])
|
||||||
AC_CONFIG_FILES([Makefile
|
AC_CONFIG_FILES([Makefile
|
||||||
src/Makefile
|
src/Makefile
|
||||||
|
@ -9,6 +9,7 @@ in {
|
|||||||
bzip2 = "@bzip2@";
|
bzip2 = "@bzip2@";
|
||||||
xz = "@xz@";
|
xz = "@xz@";
|
||||||
tar = "@tar@";
|
tar = "@tar@";
|
||||||
|
tarFlags = "@tarFlags@";
|
||||||
tr = "@tr@";
|
tr = "@tr@";
|
||||||
curl = "@curl@";
|
curl = "@curl@";
|
||||||
nixBinDir = fromEnv "NIX_BIN_DIR" "@bindir@";
|
nixBinDir = fromEnv "NIX_BIN_DIR" "@bindir@";
|
||||||
|
@ -6,7 +6,7 @@ let
|
|||||||
''
|
''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
cd $out
|
cd $out
|
||||||
${bzip2} -d < $src | ${tar} xf -
|
${bzip2} -d < $src | ${tar} xf - --warning=no-timestamp
|
||||||
mv * $out/$channelName
|
mv * $out/$channelName
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
-e "s^@coreutils\@^$(coreutils)^g" \
|
-e "s^@coreutils\@^$(coreutils)^g" \
|
||||||
-e "s^@sed\@^$(sed)^g" \
|
-e "s^@sed\@^$(sed)^g" \
|
||||||
-e "s^@tar\@^$(tar)^g" \
|
-e "s^@tar\@^$(tar)^g" \
|
||||||
|
-e "s^@tarFlags\@^$(tarFlags)^g" \
|
||||||
-e "s^@gzip\@^$(gzip)^g" \
|
-e "s^@gzip\@^$(gzip)^g" \
|
||||||
-e "s^@pv\@^$(pv)^g" \
|
-e "s^@pv\@^$(pv)^g" \
|
||||||
-e "s^@tr\@^$(tr)^g" \
|
-e "s^@tr\@^$(tr)^g" \
|
||||||
|
Loading…
Reference in New Issue
Block a user