diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/dns.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz guix-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.zip | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/dns.scm')
| -rw-r--r-- | gnu/packages/dns.scm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 86185373c4..a0388a1419 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -625,6 +625,7 @@ to result in system-wide compromise.") (inputs `(("expat" ,expat) ("libevent" ,libevent) + ("nghttp2" ,nghttp2 "lib") ("protobuf" ,protobuf) ("python-wrapper" ,python-wrapper) ("openssl" ,openssl))) @@ -632,6 +633,8 @@ to result in system-wide compromise.") `(#:configure-flags (list "--disable-static" ; save space and non-determinism in libunbound.a (string-append + "--with-libnghttp2=" (assoc-ref %build-inputs "nghttp2")) + (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl")) (string-append "--with-libevent=" (assoc-ref %build-inputs "libevent")) |