diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-05-17 16:04:54 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-05-17 17:05:47 -0400 |
| commit | 393bcc012f7a30e9a141499d2f07d56b46354a91 (patch) | |
| tree | 07b262e2f401233ddc92024a27d778f100b7ba5b | |
| parent | 423a3a6b6a254165cd916b7808cdc1767b58c0e2 (diff) | |
| download | guix-patches-393bcc012f7a30e9a141499d2f07d56b46354a91.tar guix-patches-393bcc012f7a30e9a141499d2f07d56b46354a91.tar.gz | |
gnu: botan: Use new style and G-Expressions.
* gnu/packages/crypto.scm (botan)[phases]: Adjust to use gexps.
{check}: Replace 'if' with 'when'.
[native-inputs]: Use new style.
| -rw-r--r-- | gnu/packages/crypto.scm | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 25aa745b7e..e98d9634dc 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2022 Allan Adair <allan@adair.no> +;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -956,38 +957,34 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R "0q2mzzg0a40prp9gwjk7d9fn8kwj6z2x6h6mzlm0hr6sxz7h0vp2")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out")) - (lib (string-append out "/lib"))) - ;; Upstream tests and benchmarks with -O3. - (setenv "CXXFLAGS" "-O3") - (invoke "python" "./configure.py" - (string-append "--prefix=" out) - "--disable-static" + (list + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Upstream tests and benchmarks with -O3. + (setenv "CXXFLAGS" "-O3") + (invoke "python" "./configure.py" + (string-append "--prefix=" #$output) + "--disable-static" - ;; Otherwise, the `botan` executable cannot find - ;; libbotan. - (string-append "--ldflags=-Wl,-rpath=" lib) + ;; Otherwise, the `botan` executable cannot find + ;; libbotan. + (string-append "--ldflags=-Wl,-rpath=" #$output "/lib") - "--with-os-feature=getentropy" - "--with-rst2man" + "--with-os-feature=getentropy" + "--with-rst2man" - ;; Recommended by upstream - "--with-zlib" "--with-bzip2" "--with-sqlite3")))) - (add-before 'check 'library-path-for-tests - (lambda _ (setenv "LD_LIBRARY_PATH" (getcwd)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (invoke "./botan-test"))))))) - (native-inputs - `(("python" ,python-wrapper) - ("python-docutils" ,python-docutils))) - (inputs - (list sqlite bzip2 zlib)) + ;; Recommended by upstream + "--with-zlib" "--with-bzip2" "--with-sqlite3"))) + (add-before 'check 'library-path-for-tests + (lambda _ (setenv "LD_LIBRARY_PATH" (getcwd)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./botan-test"))))))) + (native-inputs (list python-wrapper python-docutils)) + (inputs (list sqlite bzip2 zlib)) (synopsis "Cryptographic library in C++11") (description "Botan is a cryptography library, written in C++11, offering the tools necessary to implement a range of practical systems, such as TLS/DTLS, |