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

Add dependency on libcurl-dev

Browse source 
http://hydra.nixos.org/eval/1179370
This commit is contained in:
Eelco Dolstra 2015-03-27 12:27:36 +01:00
parent 000b5a000f
commit be1ff23352
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -206,6 +206,10 @@ AC_CHECK_HEADERS([bzlib.h], [true],
PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.6.19], [CXXFLAGS="$SQLITE3_CFLAGS $CXXFLAGS"]) 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. # Look for libsodium, an optional dependency.
PKG_CHECK_MODULES([SODIUM], [libsodium], PKG_CHECK_MODULES([SODIUM], [libsodium],
[AC_DEFINE([HAVE_SODIUM], [1], [Whether to use libsodium for cryptography.]) [AC_DEFINE([HAVE_SODIUM], [1], [Whether to use libsodium for cryptography.])

4
release.nix
View file

@ -273,7 +273,7 @@ let
src = jobs.tarball; src = jobs.tarball;
diskImage = (diskImageFun vmTools.diskImageFuns) diskImage = (diskImageFun vmTools.diskImageFuns)
{ extraPackages = { 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; }; ++ extraPackages; };
memSize = 1024; memSize = 1024;
meta.schedulingPriority = 50; meta.schedulingPriority = 50;
@ -293,7 +293,7 @@ let
name = "nix-deb"; name = "nix-deb";
src = jobs.tarball; src = jobs.tarball;
diskImage = (diskImageFun vmTools.diskImageFuns) 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; memSize = 1024;
meta.schedulingPriority = 50; meta.schedulingPriority = 50;
configureFlags = "--sysconfdir=/etc"; configureFlags = "--sysconfdir=/etc";