me
/
guix
Archived
1
0
Fork 0
Code

gnu: pam-mount: Remove input labels. 

* gnu/packages/admin.scm (pam-mount)[inputs]:
Remove input labels.
[arguments]: Replace the 'fix-program-paths phase with a new
'patch-file-names one.  Don't explicitly return #t from it.
master
Tobias Geerinckx-Rice 2022-10-30 02:00:03 +01:00
parent f3f0121ba0
commit 7174391cac
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
gnu/packages/admin.scm
View File

@ -4633,45 +4633,47 @@ tcpdump and snoop.")
(sha256 (sha256
(base32 "0832nh2qf9pisgwnbgx6hkylx5d7i416l19y3ly4ifv7k1p7mxqa")))) (base32 "0832nh2qf9pisgwnbgx6hkylx5d7i416l19y3ly4ifv7k1p7mxqa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs
(list perl pkg-config))
(inputs
`(("cryptsetup" ,cryptsetup)
("libhx" ,libhx)
("libxml2" ,libxml2)
("linux-pam" ,linux-pam)
("lvm2" ,lvm2)
("openssl" ,openssl)
("pcre2" ,pcre2)
("libmount" ,util-linux "lib")
("util-linux" ,util-linux)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-slibdir=" %output "/lib") (list (string-append "--with-slibdir=" %output "/lib")
(string-append "--with-ssbindir=" %output "/sbin")) (string-append "--with-ssbindir=" %output "/sbin"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-program-paths (add-after 'unpack 'patch-file-names
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((util-linux (assoc-ref inputs "util-linux")) (let ((out (assoc-ref outputs "out")))
(out (assoc-ref outputs "out")))
(substitute* "src/mtcrypt.c" (substitute* "src/mtcrypt.c"
(("\"mount\";") (("\"(mount|umount)\";" _ command)
(string-append "\"" util-linux "/bin/mount\";")) (format #f "\"~a\";"
(("\"umount\";") (search-input-file inputs
(string-append "\"" util-linux "/bin/umount\";")) (string-append "bin/" command))))
(("\"fsck\",") (("\"(fsck)\"," _ command)
(string-append "\"" util-linux "/sbin/fsck\","))) (format #f "\"~a\","
(search-input-file inputs
(string-append "sbin/" command)))))
(substitute* "src/rdconf1.c" (substitute* "src/rdconf1.c"
(("\"mount\", \"") (("\"(mount|umount)\", \"" _ command)
(string-append "\"" util-linux "/bin/mount\", \"")) (format #f "\"~a\", \""
(("\"umount\", \"") (search-input-file inputs
(string-append "\"" util-linux "/bin/umount\", \"")) (string-append "bin/" command))))
(("\"fsck\", \"") (("\"(fsck)\", \"" _ command)
(string-append "\"" util-linux "/sbin/fsck\", \"")) (format #f "\"~a\", \""
(search-input-file inputs
(string-append "sbin/" command))))
(("\"pmvarrun\", \"") (("\"pmvarrun\", \"")
(string-append "\"" out "/sbin/pmvarrun\", \"")))) (format #f "\"~a/sbin/pmvarrun\", \"" out)))))))))
#t))))) (native-inputs
(list perl pkg-config))
(inputs
(list cryptsetup
libhx
libxml2
linux-pam
lvm2
openssl
pcre2
`(,util-linux "lib")
util-linux))
(home-page "https://inai.de/projects/pam_mount/") (home-page "https://inai.de/projects/pam_mount/")
(synopsis "PAM module to mount volumes for a user session") (synopsis "PAM module to mount volumes for a user session")
(description (description