From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEm7a-0002yY-Ar for guix-patches@gnu.org; Tue, 14 Nov 2017 20:04:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEm7W-0008Rc-DL for guix-patches@gnu.org; Tue, 14 Nov 2017 20:04:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:60342) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eEm7W-0008RQ-8E for guix-patches@gnu.org; Tue, 14 Nov 2017 20:04:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eEm7V-0002Kw-SU for guix-patches@gnu.org; Tue, 14 Nov 2017 20:04:01 -0500 Subject: [bug#29301] [PATCH] substitute* hard-coded paths with paths from "out" Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEm7J-0002x0-V0 for guix-patches@gnu.org; Tue, 14 Nov 2017 20:03:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEm7G-00081n-0b for guix-patches@gnu.org; Tue, 14 Nov 2017 20:03:49 -0500 Received: from mail-yw0-x22c.google.com ([2607:f8b0:4002:c05::22c]:46833) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eEm7F-00080f-Rs for guix-patches@gnu.org; Tue, 14 Nov 2017 20:03:45 -0500 Received: by mail-yw0-x22c.google.com with SMTP id a4so109657ywh.3 for ; Tue, 14 Nov 2017 17:03:45 -0800 (PST) Received: from libre (mb94636d0.tmodns.net. [208.54.70.185]) by smtp.gmail.com with ESMTPSA id b207sm8909937ywh.42.2017.11.14.17.03.43 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Nov 2017 17:03:43 -0800 (PST) Message-Id: <8760accpzl.fsf@gmail.com> From: Kristofer Buffington MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Date: Tue, 14 Nov 2017 19:41:36 -0500 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29301@debbugs.gnu.org * 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 =C2=A9 2017 Mathieu Othacehe ;;; Copyright =C2=A9 2017 Theodoros Foradis ;;; Copyright =C2=A9 2017 ng0 +;;; Copyright =C2=A9 2017 Kristofer Buffington ;;; ;;; 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:][:spa= ce:]]+") - "")))))) + "")) + )))) (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 t= o 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' execu= table #t))) (add-after 'install 'wrap-art --=20 2.15.0 Message-ID: <877euscq0y.fsf@gmail.com>