From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?B?5a6L5paH5q2m?= Subject: [PATCH 2/2] gnu: fish: Use /etc as sysconfdir Date: Sat, 06 Dec 2014 15:01:00 +0800 Message-ID: <877fy5xnwz.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/x-patch Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xx9Me-0007Ja-Mq for guix-devel@gnu.org; Sat, 06 Dec 2014 02:01:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xx9MZ-0005z3-22 for guix-devel@gnu.org; Sat, 06 Dec 2014 02:01:12 -0500 Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]:53905) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xx9MY-0005yw-PS for guix-devel@gnu.org; Sat, 06 Dec 2014 02:01:06 -0500 Received: by mail-pa0-f50.google.com with SMTP id bj1so2047707pad.23 for ; Fri, 05 Dec 2014 23:01:06 -0800 (PST) Received: from akarin ([59.172.247.101]) by mx.google.com with ESMTPSA id f1sm17012133pds.93.2014.12.05.23.01.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Dec 2014 23:01:05 -0800 (PST) Content-Disposition: attachment; filename=0002-gnu-fish-Use-etc-as-sysconfdir.patch 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org >From c013b47d1947b1d0f01ce95e2ed8ecf98c236b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 6 Dec 2014 14:53:00 +0800 Subject: [PATCH 2/2] gnu: fish: Use /etc as sysconfdir. * gnu/packages/fish.scm (fish) [arguments]: Add #:configure-flags. [origin]: Add snippet. --- gnu/packages/fish.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fish.scm b/gnu/packages/fish.scm index ee11124..9398446 100644 --- a/gnu/packages/fish.scm +++ b/gnu/packages/fish.scm @@ -35,14 +35,20 @@ version "/fish-" version ".tar.gz")) (sha256 (base32 - "096rhi911s3j618cvp8fj9pb4jniy3y6415jvjg8bhszsp1x7r5p")))) + "096rhi911s3j618cvp8fj9pb4jniy3y6415jvjg8bhszsp1x7r5p")) + (modules '((guix build utils))) + ;; Don't try to install /etc/fish/config.fish. + (snippet + '(substitute* "Makefile.in" + ((".*INSTALL.*sysconfdir.*fish.*") ""))))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen))) (inputs `(("ncurses" ,ncurses))) (arguments - '(#:tests? #f)) ; no check target + '(#:tests? #f ; no check target + #:configure-flags '("--sysconfdir=/etc"))) (synopsis "The friendly interactive shell") (description "Fish (friendly interactive shell) is a shell focused on interactive use, -- 2.1.2