diff options
| author | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2019-12-09 18:39:37 +0700 |
|---|---|---|
| committer | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2019-12-09 18:39:37 +0700 |
| commit | f765e441237cb6679c33cb44372a5b30168c42c8 (patch) | |
| tree | cdf0446af148faffe696f75547f29cab6d125faf | |
| parent | 3663a8a7e92bd66f21fa653ba4d825a357ca6168 (diff) | |
downgrade required libarchive version (ubuntu 16.04)
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | release.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 29835195f..28a7b68fb 100644 --- a/configure.ac +++ b/configure.ac @@ -179,7 +179,7 @@ AC_CHECK_LIB([bz2], [BZ2_bzWriteOpen], [true], AC_CHECK_HEADERS([bzlib.h], [true], [AC_MSG_ERROR([Nix requires libbz2, which is part of bzip2. See https://web.archive.org/web/20180624184756/http://www.bzip.org/.])]) # Checks for libarchive -PKG_CHECK_MODULES([LIBARCHIVE], [libarchive >= 3.4.0], [CXXFLAGS="$LIBARCHIVE_CFLAGS $CXXFLAGS"]) +PKG_CHECK_MODULES([LIBARCHIVE], [libarchive >= 3.1.2], [CXXFLAGS="$LIBARCHIVE_CFLAGS $CXXFLAGS"]) # Look for SQLite, a required dependency. PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.6.19], [CXXFLAGS="$SQLITE3_CFLAGS $CXXFLAGS"]) diff --git a/release.nix b/release.nix index 5d742958c..65c94b17c 100644 --- a/release.nix +++ b/release.nix @@ -424,7 +424,7 @@ let postInstall = "make installcheck"; configureFlags = "--sysconfdir=/etc"; debRequires = - [ "curl" "libsqlite3-0" "libbz2-1.0" "bzip2" "xz-utils" "libssl1.0.0" "liblzma5" "libseccomp2" ] + [ "curl" "libsqlite3-0" "libbz2-1.0" "bzip2" "xz-utils" "libarchive" "libssl1.0.0" "liblzma5" "libseccomp2" ] ++ extraDebPackages; debMaintainer = "Eelco Dolstra <eelco.dolstra@logicblox.com>"; doInstallCheck = true; |