me
/
guix
Archived
1
0
Fork 0
Code

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

* gnu/packages/linux.scm (mergerfs)[inputs]: Add bash-minimal.
[arguments]: Refer to it rather than to the native build bash.
master
Tobias Geerinckx-Rice 2021-07-09 02:52:47 +02:00
parent 5f071925ef
commit 478104c398
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/file-systems.scm
View File

@ -44,6 +44,7 @@
#:use-module (gnu packages attr) #:use-module (gnu packages attr)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -1404,8 +1405,8 @@ On Guix System, you will need to invoke the included shell scripts as
(string-append (assoc-ref inputs "util-linux") (string-append (assoc-ref inputs "util-linux")
"/bin/" maybe-u "mount"))) "/bin/" maybe-u "mount")))
(substitute* '("libfuse/util/mount.mergerfs.c") (substitute* '("libfuse/util/mount.mergerfs.c")
(("/bin/sh") (("/bin/sh" command)
(which "sh"))) (string-append (assoc-ref inputs "bash-minimal") command)))
;; The Makefile does not allow overriding PREFIX via make variables. ;; The Makefile does not allow overriding PREFIX via make variables.
(substitute* '("Makefile" "libfuse/Makefile") (substitute* '("Makefile" "libfuse/Makefile")
(("= /usr/local") (string-append "= " (assoc-ref outputs "out"))) (("= /usr/local") (string-append "= " (assoc-ref outputs "out")))
@ -1416,7 +1417,9 @@ On Guix System, you will need to invoke the included shell scripts as
(("strip") "true")) (("strip") "true"))
#t))))) #t)))))
;; mergerfs bundles a heavily modified copy of libfuse. ;; mergerfs bundles a heavily modified copy of libfuse.
(inputs `(("util-linux" ,util-linux))) (inputs
`(("bash-minimal" ,bash-minimal)
("util-linux" ,util-linux)))
(home-page "https://github.com/trapexit/mergerfs") (home-page "https://github.com/trapexit/mergerfs")
(synopsis "Featureful union file system") (synopsis "Featureful union file system")
(description "mergerfs is a union file system geared towards simplifying (description "mergerfs is a union file system geared towards simplifying