diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-03-27T11·27+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-03-27T11·27+0100 |
| commit | be1ff233526cc90d36eb13fdee690cf508baeb7a (patch) | |
| tree | 26afb33baf29ffd55cee8f5cdfd922e5c46384f0 | |
| parent | 000b5a000f8ceef9d79c7e8a9835fde9a98c367f (diff) | |
Add dependency on libcurl-dev
http://hydra.nixos.org/eval/1179370
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | release.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 756b2f22729c..1d4b7d3b8995 100644 --- a/configure.ac +++ b/configure.ac @@ -206,6 +206,10 @@ AC_CHECK_HEADERS([bzlib.h], [true], PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.6.19], [CXXFLAGS="$SQLITE3_CFLAGS $CXXFLAGS"]) +# Look for libcurl, a required dependency. +PKG_CHECK_MODULES([LIBCURL], [libcurl], [CXXFLAGS="$LIBCURL_CFLAGS $CXXFLAGS"]) + + # Look for libsodium, an optional dependency. PKG_CHECK_MODULES([SODIUM], [libsodium], [AC_DEFINE([HAVE_SODIUM], [1], [Whether to use libsodium for cryptography.]) diff --git a/release.nix b/release.nix index de539958cc07..048fa8886a9b 100644 --- a/release.nix +++ b/release.nix @@ -273,7 +273,7 @@ let src = jobs.tarball; diskImage = (diskImageFun vmTools.diskImageFuns) { extraPackages = - [ "perl-DBD-SQLite" "perl-devel" "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "perl-WWW-Curl" ] + [ "perl-DBD-SQLite" "perl-devel" "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "perl-WWW-Curl" "libcurl-devel" ] ++ extraPackages; }; memSize = 1024; meta.schedulingPriority = 50; @@ -293,7 +293,7 @@ let name = "nix-deb"; src = jobs.tarball; diskImage = (diskImageFun vmTools.diskImageFuns) - { extraPackages = [ "libdbd-sqlite3-perl" "libsqlite3-dev" "libbz2-dev" "libwww-curl-perl" ]; }; + { extraPackages = [ "libdbd-sqlite3-perl" "libsqlite3-dev" "libbz2-dev" "libwww-curl-perl" "libcurl-dev" ]; }; memSize = 1024; meta.schedulingPriority = 50; configureFlags = "--sysconfdir=/etc"; |