ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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