summaryrefslogtreecommitdiff
path: root/gnu/packages/cryptsetup.scm
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2025-01-01 12:10:27 +0100
committerAndreas Enge <andreas@enge.fr>2025-07-18 20:17:19 +0200
commit5030933bc6c0de223f2cb55b32b38bc5fa39c724 (patch)
tree66f99cdde5aa6e7c2aeb44374ec8a65a0a3868b5 /gnu/packages/cryptsetup.scm
parentf555405fce8a36a095898638b694d337f3a07ec8 (diff)
gnu: cryptsetup-static: Update to latest json-c (0.18).
* gnu/packages/cryptsetup.scm (static-library): Also cater for the cmake build system. (cryptsetup-static)[inputs]: Update to use json-c instead of json-c-0.13. Change-Id: Ic1d3644227d34d72204b4f670f1c84bfcea19702
Diffstat (limited to 'gnu/packages/cryptsetup.scm')
-rw-r--r--gnu/packages/cryptsetup.scm14
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index b78713f44d9..d1c14e25cd5 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -4,7 +4,7 @@
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;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
6;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net> 6;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
7;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> 7;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
8;;; 8;;;
9;;; This file is part of GNU Guix. 9;;; This file is part of GNU Guix.
10;;; 10;;;
@@ -25,6 +25,7 @@
25 #:use-module ((guix licenses) #:prefix license:) 25 #:use-module ((guix licenses) #:prefix license:)
26 #:use-module (guix packages) 26 #:use-module (guix packages)
27 #:use-module (guix download) 27 #:use-module (guix download)
28 #:use-module (guix build-system cmake)
28 #:use-module (guix build-system gnu) 29 #:use-module (guix build-system gnu)
29 #:use-module (guix gexp) 30 #:use-module (guix gexp)
30 #:use-module (guix utils) 31 #:use-module (guix utils)
@@ -123,8 +124,13 @@ files). This assumes LIBRARY uses Libtool."
123 (arguments 124 (arguments
124 (substitute-keyword-arguments (package-arguments library) 125 (substitute-keyword-arguments (package-arguments library)
125 ((#:configure-flags flags #~'()) 126 ((#:configure-flags flags #~'())
126 #~(append '("--disable-shared" "--enable-static") 127 (let* ((build-system (package-build-system library))
127 #$flags)))))) 128 (static-flags (cond ((eq? build-system cmake-build-system)
129 '("-DBUILD_SHARED_LIBS=OFF"))
130 (else
131 '("--disable-shared" "--enable-static")))))
132 #~(append '#$static-flags
133 #$flags)))))))
128 134
129(define-public cryptsetup-static 135(define-public cryptsetup-static
130 ;; Stripped-down statically-linked 'cryptsetup' command for use in initrds. 136 ;; Stripped-down statically-linked 'cryptsetup' command for use in initrds.
@@ -181,7 +187,7 @@ files). This assumes LIBRARY uses Libtool."
181 (propagated-inputs 187 (propagated-inputs
182 `(("libgpg-error-host" ,(static-library libgpg-error))))))) 188 `(("libgpg-error-host" ,(static-library libgpg-error)))))))
183 `(("argon2" ,(static-library argon2)) 189 `(("argon2" ,(static-library argon2))
184 ("json-c" ,(static-library json-c-0.13)) 190 ("json-c" ,(static-library json-c))
185 ("libgcrypt" ,libgcrypt-static) 191 ("libgcrypt" ,libgcrypt-static)
186 ("lvm2" ,lvm2-static) 192 ("lvm2" ,lvm2-static)
187 ("util-linux" ,util-linux "static") 193 ("util-linux" ,util-linux "static")