aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorNikita Domnitskii <nikita@domnitskii.me>2024-09-20 02:43:04 +0000
committerOleg Pykhalov <go.wigust@gmail.com>2024-11-01 18:33:30 +0300
commit2c5bcb1f308891b638ecf23c016bed0314b5ed0b (patch)
tree036595d13963e312e541e4606444c6886443ac7d /gnu/packages
parent94e0028d6f0f60cc390b98866718245ebb197f54 (diff)
downloadguix-2c5bcb1f308891b638ecf23c016bed0314b5ed0b.tar
guix-2c5bcb1f308891b638ecf23c016bed0314b5ed0b.tar.gz
gnu: pam-mount: Fix libcryptsetup detection.
* gnu/packages/admin.scm (pam-mount): Fix libcryptsetup detection. [inputs]: Add extra inputs required for libcryptsetup, remove duplicates. [arguments]<#:configure-flags>: Explicitly enable cryptsetup in order to detect breakage in the future. Change-Id: Icf588945279c8785081a8049d401eaf7e6a22e3c Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com>
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/admin.scm23
1 files changed, 13 insertions, 10 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 86f35d49ad..47ccb09462 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -68,6 +68,8 @@
;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com>
;;; Copyright © 2024 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2024 nathan <nathan_mail@nborghese.com>
+;;; Copyright © 2024 Nikita Domnitskii <nikita@domnitskii.me>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -4916,7 +4918,8 @@ tcpdump and snoop.")
(list
#:configure-flags
#~(list (string-append "--with-slibdir=" #$output "/lib")
- (string-append "--with-ssbindir=" #$output "/sbin"))
+ (string-append "--with-ssbindir=" #$output "/sbin")
+ "--with-cryptsetup")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-file-names
@@ -4945,15 +4948,15 @@ tcpdump and snoop.")
(native-inputs
(list perl pkg-config))
(inputs
- (list cryptsetup
- libhx
- libxml2
- linux-pam
- lvm2
- openssl
- pcre2
- `(,util-linux "lib")
- util-linux))
+ (append
+ (cons cryptsetup (libcryptsetup-propagated-inputs))
+ (list libhx
+ libxml2
+ linux-pam
+ openssl
+ pcre2
+ util-linux
+ eudev)))
(home-page "https://inai.de/projects/pam_mount/")
(synopsis "PAM module to mount volumes for a user session")
(description