[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#73374] [PATCH v3 1/2] gnu: pam-mount: Fix libcryptsetup detection.
From: |
Nikita Domnitskii |
Subject: |
[bug#73374] [PATCH v3 1/2] gnu: pam-mount: Fix libcryptsetup detection. |
Date: |
Thu, 31 Oct 2024 15:30:06 -0000 |
* 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
---
gnu/packages/admin.scm | 23 +++++++++++++----------
1 file 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 @@ (define-public pam-mount
(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 @@ (define-public pam-mount
(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
--
Best Regards,
Nikita Domnitskii