unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: "Thompson, David" <dthompson2@worcester.edu>
To: John Darrington <jmd@gnu.org>
Cc: guix-devel <guix-devel@gnu.org>
Subject: Re: [PATCH 1/2] gnu: postgresql: Substitute hard coded "/bin/sh".
Date: Thu, 24 Mar 2016 14:18:19 -0400	[thread overview]
Message-ID: <CAJ=RwfaqjQ+wGn=4bFL3Cxe7OaiMD8Zp8oyetAMbjP__NmQqtA@mail.gmail.com> (raw)
In-Reply-To: <1458842090-14030-1-git-send-email-jmd@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

  reply	other threads:[~2016-03-24 18:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-24 17:54 [PATCH 1/2] gnu: postgresql: Substitute hard coded "/bin/sh" John Darrington
2016-03-24 18:18 ` Thompson, David [this message]
2016-03-24 21:12   ` [PATCH] " John Darrington
2016-03-24 21:24     ` Ricardo Wurmus
2016-03-25  7:29       ` John Darrington

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAJ=RwfaqjQ+wGn=4bFL3Cxe7OaiMD8Zp8oyetAMbjP__NmQqtA@mail.gmail.com' \
    --to=dthompson2@worcester.edu \
    --cc=guix-devel@gnu.org \
    --cc=jmd@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).