gnu: gnunet: Add input libmicrohttpd.

* gnu/packages/gnunet.scm (gnunet): Add input libmicrohttpd and improve
    formatting.
This commit is contained in:
Andreas Enge 2014-02-10 23:44:57 +01:00
parent 99fbddf9a6
commit 05e8a0b005
1 changed files with 21 additions and 19 deletions

View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -213,16 +214,17 @@ supports HTTPS, HTTPS and GnuTLS.")
(patch-flags '("-p0")))) (patch-flags '("-p0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gnutls" ,gnutls) `(("glpk" ,glpk)
("glpk" ,glpk) ("gnurl" ,gnurl)
("gnutls" ,gnutls)
("libextractor" ,libextractor) ("libextractor" ,libextractor)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("gnurl" ,gnurl)
("libidn" ,libidn) ("libidn" ,libidn)
("libmicrohttpd" ,libmicrohttpd)
("libtool" ,libtool)`
("libunistring" ,libunistring)
("openssl" ,openssl) ("openssl" ,openssl)
("opus" ,opus) ("opus" ,opus)
("libtool" ,libtool)
("libunistring" ,libunistring)
("pulseaudio", pulseaudio) ("pulseaudio", pulseaudio)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -231,19 +233,19 @@ supports HTTPS, HTTPS and GnuTLS.")
("python" ,python-2))) ("python" ,python-2)))
(arguments (arguments
'(#:phases '(#:phases
;; swap check and install phases and set paths to installed binaries ;; swap check and install phases and set paths to installed binaries
(alist-cons-before (alist-cons-before
'check 'set-path-for-check 'check 'set-path-for-check
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(setenv "GNUNET_PREFIX" out) (setenv "GNUNET_PREFIX" out)
(setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")))) (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))))
(alist-cons-after (alist-cons-after
'install 'check 'install 'check
(assoc-ref %standard-phases 'check) (assoc-ref %standard-phases 'check)
(alist-delete (alist-delete
'check 'check
%standard-phases))))) %standard-phases)))))
(synopsis "Anonymous peer-to-peer file-sharing framework") (synopsis "Anonymous peer-to-peer file-sharing framework")
(description (description
"GNUnet is a framework for secure, peer-to-peer networking. It works in a "GNUnet is a framework for secure, peer-to-peer networking. It works in a