unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Nikita Domnitskii via Guix-patches via <guix-patches@gnu.org>
To: 73374@debbugs.gnu.org
Subject: [bug#73374] [PATCH v3 1/2] gnu: pam-mount: Fix libcryptsetup detection.
Date: Fri, 20 Sep 2024 02:43:04 +0000	[thread overview]
Message-ID: <8fa08d18a3d2221fb8e324db565673144ce253a0.1730387833.git.nikita@domnitskii.me> (raw)
In-Reply-To: <cover.1730387833.git.nikita@domnitskii.me>

* 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




  reply	other threads:[~2024-10-31 15:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-20  2:43 [bug#73374] [PATCH] gnu: pam-mount: fix libcryptsetup detection nathan via Guix-patches via
2024-10-31  6:21 ` [bug#73374] [PATCH v2 0/3] Fix and update pam-mount Nikita Domnitskii via Guix-patches via
2024-09-20  2:43   ` [bug#73374] [PATCH v2 1/3] gnu: pam-mount: Fix libcryptsetup detection Nikita Domnitskii via Guix-patches via
2024-10-31  5:47   ` [bug#73374] [PATCH v2 3/3] gnu: pam-mount: Update to 2.20 Nikita Domnitskii via Guix-patches via
2024-10-31  5:59   ` [bug#73374] [PATCH v2 2/3] gnu: pam-mount: Remove lvm2 from inputs Nikita Domnitskii via Guix-patches via
2024-10-31 15:17 ` [bug#73374] [PATCH v3 0/2] Nikita Domnitskii via Guix-patches via
2024-09-20  2:43   ` Nikita Domnitskii via Guix-patches via [this message]
2024-10-31  5:47   ` [bug#73374] [PATCH v3 2/2] gnu: pam-mount: Update to 2.20 Nikita Domnitskii via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8fa08d18a3d2221fb8e324db565673144ce253a0.1730387833.git.nikita@domnitskii.me \
    --to=guix-patches@gnu.org \
    --cc=73374@debbugs.gnu.org \
    --cc=nikita@domnitskii.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).