guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 1/2] gnu: postgresql: Substitute hard coded "/bin/sh".


From: Thompson, David
Subject: Re: [PATCH 1/2] gnu: postgresql: Substitute hard coded "/bin/sh".
Date: Thu, 24 Mar 2016 14:18:19 -0400

On Thu, Mar 24, 2016 at 1:54 PM, John Darrington <address@hidden> 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 via email to

[Prev in Thread] Current Thread [Next in Thread]