[PATCH 2/2] gnu: fish: Use /etc as sysconfdir

[PATCH 2/2] gnu: fish: Use /etc as sysconfdir

[宋文武]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0002-gnu-fish-Use-etc-as-sysconfdir.patch --]
[-- Type: text/x-patch, Size: 1523 bytes --]

From c013b47d1947b1d0f01ce95e2ed8ecf98c236b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
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

Re: [PATCH 2/2] gnu: fish: Use /etc as sysconfdir

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> From c013b47d1947b1d0f01ce95e2ed8ecf98c236b65 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
> 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.

LGTM.

Ludo'.