me
/
guix
Archived
1
0
Fork 0
Code

gnu: fuse: Do not refer to the native bash. 

* gnu/packages/linux.scm (fuse)[inputs]: Add bash-minimal.
[arguments]: Refer to it rather than to the native build bash.
Do not return #t from phases.
master
Tobias Geerinckx-Rice 2021-07-09 02:35:23 +02:00
parent d2b30db788
commit 4f4477a77e
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/linux.scm
View File

@ -3084,7 +3084,9 @@ processes currently causing I/O.")
"1ddlq6kzxilccgbvxjfx80jx6kamgw4sv49phks2zhlcc1frvrnh")) "1ddlq6kzxilccgbvxjfx80jx6kamgw4sv49phks2zhlcc1frvrnh"))
(patches (search-patches "fuse-overlapping-headers.patch")))) (patches (search-patches "fuse-overlapping-headers.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("util-linux" ,util-linux))) (inputs
`(("bash-minimal" ,bash-minimal)
("util-linux" ,util-linux)))
(arguments (arguments
'(#:configure-flags (list (string-append "MOUNT_FUSE_PATH=" '(#:configure-flags (list (string-append "MOUNT_FUSE_PATH="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
@ -3107,9 +3109,9 @@ processes currently causing I/O.")
(("/bin/(u?)mount" _ maybe-u) (("/bin/(u?)mount" _ maybe-u)
(string-append (assoc-ref inputs "util-linux") (string-append (assoc-ref inputs "util-linux")
"/bin/" maybe-u "mount"))) "/bin/" maybe-u "mount")))
(substitute* '("util/mount.fuse.c") (substitute* "util/mount.fuse.c"
(("/bin/sh") (("/bin/sh" command)
(which "sh"))) (string-append (assoc-ref inputs "bash-minimal") command)))
;; This hack leads libfuse to search for 'fusermount' in ;; This hack leads libfuse to search for 'fusermount' in
;; $PATH, where it may find a setuid-root binary, instead of ;; $PATH, where it may find a setuid-root binary, instead of
@ -3117,8 +3119,7 @@ processes currently causing I/O.")
;; it's not setuid. ;; it's not setuid.
(substitute* "lib/Makefile" (substitute* "lib/Makefile"
(("-DFUSERMOUNT_DIR=[[:graph:]]+") (("-DFUSERMOUNT_DIR=[[:graph:]]+")
"-DFUSERMOUNT_DIR=\\\"/var/empty\\\"")) "-DFUSERMOUNT_DIR=\\\"/var/empty\\\"")))))))
#t)))))
(supported-systems (delete "i586-gnu" %supported-systems)) (supported-systems (delete "i586-gnu" %supported-systems))
(home-page "https://github.com/libfuse/libfuse") (home-page "https://github.com/libfuse/libfuse")
(synopsis "Support file systems implemented in user space") (synopsis "Support file systems implemented in user space")