diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2025-01-01 12:10:27 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:19 +0200 |
| commit | 5030933bc6c0de223f2cb55b32b38bc5fa39c724 (patch) | |
| tree | 66f99cdde5aa6e7c2aeb44374ec8a65a0a3868b5 | |
| parent | f555405fce8a36a095898638b694d337f3a07ec8 (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
| -rw-r--r-- | gnu/packages/cryptsetup.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index b78713f44d..d1c14e25cd 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net> -;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +25,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix gexp) #:use-module (guix utils) @@ -123,8 +124,13 @@ files). This assumes LIBRARY uses Libtool." (arguments (substitute-keyword-arguments (package-arguments library) ((#:configure-flags flags #~'()) - #~(append '("--disable-shared" "--enable-static") - #$flags)))))) + (let* ((build-system (package-build-system library)) + (static-flags (cond ((eq? build-system cmake-build-system) + '("-DBUILD_SHARED_LIBS=OFF")) + (else + '("--disable-shared" "--enable-static"))))) + #~(append '#$static-flags + #$flags))))))) (define-public cryptsetup-static ;; Stripped-down statically-linked 'cryptsetup' command for use in initrds. @@ -181,7 +187,7 @@ files). This assumes LIBRARY uses Libtool." (propagated-inputs `(("libgpg-error-host" ,(static-library libgpg-error))))))) `(("argon2" ,(static-library argon2)) - ("json-c" ,(static-library json-c-0.13)) + ("json-c" ,(static-library json-c)) ("libgcrypt" ,libgcrypt-static) ("lvm2" ,lvm2-static) ("util-linux" ,util-linux "static") |