GNU bug report logs - #29301
[PATCH] substitute* hard-coded paths with paths from "out"

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kristofer Buffington <kristoferbuffington <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] substitute* hard-coded paths with paths from "out"
Date: Tue, 14 Nov 2017 19:41:36 -0500

* gnu/packages/guile.scm
used substitute* to correct some hardcoded paths in the artanis package
---
 gnu/packages/guile.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index abcefd32e..b7c2dd4c7 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe <at> gmail.com>
 ;;; Copyright © 2017 Theodoros Foradis <theodoros <at> foradis.org>
 ;;; Copyright © 2017 ng0 <ng0 <at> infotropique.org>
+;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -431,7 +432,8 @@ program can be installed in one go.")
                                       post)))
                     (substitute* "artanis/artanis.scm"
                       (("[[:punct:][:space:]]+->json-string[[:punct:][:space:]]+")
-                       ""))))))
+                       ""))
+                    ))))
       (build-system gnu-build-system)
       ;; TODO: Add guile-dbi and guile-dbd optional dependencies.
       (inputs `(("guile" ,guile-2.2)
@@ -458,6 +460,14 @@ program can be installed in one go.")
                    ((" /etc/bash.bashrc") " /dev/null"))
                  (substitute* "Makefile"   ;set the root of config files to OUT
                    ((" /etc") (string-append " " out "/etc")))
+                 (substitute* "artanis/config.scm"
+                   (("/etc/artanis/artanis.conf")
+                    (string-append out "/etc/artanis.conf"))
+                   (("/etc/artanis/pages")
+                    (string-append out "/etc/artanis")))
+                 (substitute* "etc/artanis/artanis.conf"
+                   (("/etc/artanis/pages")
+                    (string-append out "/etc/artanis")))
                  (mkdir-p (string-append out "/bin")) ;for the `art' executable
                  #t)))
            (add-after 'install 'wrap-art
-- 
2.15.0
Message-ID: <877euscq0y.fsf <at> gmail.com>

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.