summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2024-03-10 10:46:31 +0200
committerLudovic Courtès <ludo@gnu.org>2024-08-31 10:44:58 +0200
commitf48ecef7bda617e569e6cc8a98abccec2a9b5c3c (patch)
tree81e93c801d577c8961908b215f76b91dc8d79f60
parent0933b6b86b8e3a1cb6c82c1cce51974dff2a5205 (diff)
gnu: cryptsetup: Only use ruby-asciidoctor on supported systems.
* gnu/packages/cryptsetup.scm (cryptsetup)[native-inputs]: Only use ruby-asciidoctor on supported systems. [arguments]: When building without ruby-asciidoctor adjust the configure-flags. Change-Id: If4551833de3c5b5a28424c059644e9fa7fda5abd
-rw-r--r--gnu/packages/cryptsetup.scm40
1 files changed, 24 insertions, 16 deletions
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index 6765fed7265..44f9c779845 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -2,6 +2,7 @@
2;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> 2;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
3;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> 3;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
4;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr> 4;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
5;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
5;;; 6;;;
6;;; This file is part of GNU Guix. 7;;; This file is part of GNU Guix.
7;;; 8;;;
@@ -49,23 +50,30 @@
49 (build-system gnu-build-system) 50 (build-system gnu-build-system)
50 (arguments 51 (arguments
51 `(#:configure-flags 52 `(#:configure-flags
52 (list 53 (append
53 ;; Argon2 is always enabled, this just selects the (faster) full version. 54 (if (assoc-ref %build-inputs "ruby-asciidoctor")
54 "--enable-libargon2" 55 '()
55 ;; The default is OpenSSL which provides better PBKDF performance. 56 (list "--disable-asciidoc"))
56 "--with-crypto_backend=gcrypt" 57 (list
57 ;; GRUB 2.06 supports LUKS2, but does it reliably support all set-ups…? 58 ;; Argon2 is always enabled, this just selects the (faster) full version.
58 "--with-default-luks-format=LUKS1" 59 "--enable-libargon2"
59 ;; External tokens would need an env variable to work on Guix, and we 60 ;; The default is OpenSSL which provides better PBKDF performance.
60 ;; don't have users for it yet. 61 "--with-crypto_backend=gcrypt"
61 "--disable-external-tokens" 62 ;; GRUB 2.06 supports LUKS2, but does it reliably support all set-ups…?
62 "--disable-ssh-token" 63 "--with-default-luks-format=LUKS1"
63 ;; libgcrypt is not found otherwise when cross-compiling. 64 ;; External tokens would need an env variable to work on Guix, and we
64 ;; <https://issues.guix.gnu.org/63864> 65 ;; don't have users for it yet.
65 (string-append "--with-libgcrypt-prefix=" 66 "--disable-external-tokens"
66 (assoc-ref %build-inputs "libgcrypt"))))) 67 "--disable-ssh-token"
68 ;; libgcrypt is not found otherwise when cross-compiling.
69 ;; <https://issues.guix.gnu.org/63864>
70 (string-append "--with-libgcrypt-prefix="
71 (assoc-ref %build-inputs "libgcrypt"))))))
67 (native-inputs 72 (native-inputs
68 (list pkg-config ruby-asciidoctor)) 73 (append (list pkg-config)
74 (if (supported-package? ruby-asciidoctor)
75 (list ruby-asciidoctor)
76 '())))
69 (inputs 77 (inputs
70 (list argon2 78 (list argon2
71 json-c 79 json-c