diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-16 23:18:36 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-16 23:18:36 +0100 |
| commit | b148bd714ed975d06bdda0934a30175883a19bb0 (patch) | |
| tree | d2b47ab04fbf352c176489da18f268b72e7adde3 | |
| parent | 11e7a6cf4612b83f3fe3ecfcce3e7c0b21ecf953 (diff) | |
| download | guix-b148bd714ed975d06bdda0934a30175883a19bb0.tar guix-b148bd714ed975d06bdda0934a30175883a19bb0.tar.gz | |
gnu: fuse: Refer to the right 'mount' and 'umount' commands.
* gnu/packages/linux.scm (fuse)[inputs]: Change to...
[native-inputs]: ... this.
[arguments]: Add #:phases argument.
| -rw-r--r-- | gnu/packages/linux.scm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 28a21c1e38..b5e15400e1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -901,7 +901,7 @@ processes currently causing I/O.") (base32 "071r6xjgssy8vwdn6m28qq1bqxsd2bphcd2mzhq0grf5ybm87sqb")))) (build-system gnu-build-system) - (native-inputs `(("util-linux" ,util-linux))) + (inputs `(("util-linux" ,util-linux))) (arguments '(#:configure-flags (list (string-append "MOUNT_FUSE_PATH=" (assoc-ref %outputs "out") @@ -911,7 +911,20 @@ processes currently causing I/O.") "/etc/init.d") (string-append "UDEV_RULES_PATH=" (assoc-ref %outputs "out") - "/etc/udev")))) + "/etc/udev")) + #:phases (alist-cons-before + 'build 'set-file-names + (lambda* (#:key inputs #:allow-other-keys) + ;; libfuse calls out to mount(8) and umount(8). Make sure + ;; it refers to the right ones. + (substitute* '("lib/mount_util.c" "util/mount_util.c") + (("/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")))) + %standard-phases))) (home-page "http://fuse.sourceforge.net/") (synopsis "Support file systems implemented in user space") (description |