From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Thompson, David" <dthompson2@worcester.edu>
Subject: Re: [PATCH 1/2] gnu: postgresql: Substitute hard coded "/bin/sh".
Date: Thu, 24 Mar 2016 14:18:19 -0400
Message-ID: <CAJ=RwfaqjQ+wGn=4bFL3Cxe7OaiMD8Zp8oyetAMbjP__NmQqtA@mail.gmail.com>
References: <1458842090-14030-1-git-send-email-jmd@gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57072)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dthompson2@worcester.edu>) id 1aj9ps-00011K-Vo
	for guix-devel@gnu.org; Thu, 24 Mar 2016 14:18:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <dthompson2@worcester.edu>) id 1aj9ps-0000lV-4z
	for guix-devel@gnu.org; Thu, 24 Mar 2016 14:18:20 -0400
Received: from mail-yw0-x244.google.com ([2607:f8b0:4002:c05::244]:35523)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dthompson2@worcester.edu>) id 1aj9ps-0000lQ-09
	for guix-devel@gnu.org; Thu, 24 Mar 2016 14:18:20 -0400
Received: by mail-yw0-x244.google.com with SMTP id w6so6370966ywd.2
	for <guix-devel@gnu.org>; Thu, 24 Mar 2016 11:18:19 -0700 (PDT)
In-Reply-To: <1458842090-14030-1-git-send-email-jmd@gnu.org>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=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: John Darrington <jmd@gnu.org>
Cc: guix-devel <guix-devel@gnu.org>

On Thu, Mar 24, 2016 at 1:54 PM, John Darrington <jmd@gnu.org> wrote:
> * gnu/packages/databses.scm (postgresql): substitute /bin/sh
> with location of  bash binary.

Good catch!

> ---
>  gnu/packages/databases.scm | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index 25c1e6a..ff68d6f 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -283,6 +283,17 @@ as a drop-in replacement of MySQL.")
>                 (base32
>                  "08ba951nfiy516flaw352shj1zslxg4ryx3w5k0adls1r682l8ix"))))
>      (build-system gnu-build-system)
> +    (arguments
> +     '(#:phases (alist-cons-before
> +                 'configure 'patch-/bin/sh
> +                 (lambda* (#:key inputs #:allow-other-keys)
> +                   (let ((bash (assoc-ref inputs "bash")))
> +                     ;; Refer to the actual shell.
> +                     (substitute* '("src/bin/pg_ctl/pg_ctl.c"
> +                                    "src/bin/psql/command.c")
> +                       (("/bin/sh")
> +                        (string-append bash "/bin/sh")))))
> +                 %standard-phases)))

Please use the 'modify-phases' syntax instead.  Search
gnu/packages/*.scm for many examples of its use.

>      (inputs
>       `(("readline" ,readline)
>         ("zlib" ,zlib)))
> --
> 2.1.4
>
>

Could you send an updated patch?  Thanks!

- Dave