From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH 4/4] Add fs-search paths to util-linux Date: Thu, 10 Nov 2016 22:14:21 +0100 Message-ID: <1478812461-18483-4-git-send-email-jmd@gnu.org> References: <1478812461-18483-1-git-send-email-jmd@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4wg9-0003Fx-Rm for guix-devel@gnu.org; Thu, 10 Nov 2016 16:14:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4wg5-0003gK-HJ for guix-devel@gnu.org; Thu, 10 Nov 2016 16:14:37 -0500 In-Reply-To: <1478812461-18483-1-git-send-email-jmd@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: John Darrington * gnu/packages/linux.scm (util-linux) [arguments]: Add configure flag --enable-fs-paths=. [inputs]: Add nfs-utils. --- gnu/packages/bash.scm | 1 + gnu/packages/guile.scm | 1 + gnu/packages/linux.scm | 9 ++++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 6c3c0ba..d37b676 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -23,6 +23,7 @@ #:use-module (gnu packages) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) + #:use-module (gnu packages linux) #:use-module (gnu packages bison) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8b17aeb..8bde0e3 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages libunistring) #:use-module (gnu packages linux-base) + #:use-module (gnu packages linux) #:use-module (gnu packages m4) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pkg-config) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ac7277c..d07fb66 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages linux-base) #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) + #:use-module (gnu packages nfs) #:use-module (gnu packages perl) #:use-module (gnu packages pciutils) #:use-module (gnu packages pkg-config) @@ -439,6 +440,11 @@ providing the system administrator with some help in common tasks.") (arguments `(#:configure-flags (list "--disable-use-tty-group" + ;; FIXME: Add path to mount.fuse here + (string-append "--enable-fs-paths-default=" + (assoc-ref %build-inputs "nfs-utils") + "/sbin") + ;; Install completions where our ;; bash-completion package expects them. (string-append "--with-bashcompletiondir=" @@ -478,7 +484,8 @@ providing the system administrator with some help in common tasks.") (find-files "lib" "\\.a$"))) #t)))))) (inputs `(("zlib" ,zlib) - ("ncurses" ,ncurses))) + ("ncurses" ,ncurses) + ("nfs-utils" ,nfs-utils))) (native-inputs `(("perl" ,perl) ("net-base" ,net-base))))) ;for tests -- 2.1.4