mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 06:46:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cryptsetup-static: Update to latest json-c (0.18).

Browse source 
* 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
This commit is contained in:
Janneke Nieuwenhuizen 2025-01-01 12:10:27 +01:00
parent 19e279a383
commit 22d8fb06e4
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/cryptsetup.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -24,6 +24,7 @@ (define-module (gnu packages cryptsetup)
#: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)
@ -121,8 +122,13 @@ (define (static-library library)
(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.
@ -179,7 +185,7 @@ (define-public cryptsetup-static
(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")