From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH 1/2] gnu: postgresql: Substitute hard coded "/bin/sh". Date: Thu, 24 Mar 2016 18:54:50 +0100 Message-ID: <1458842090-14030-1-git-send-email-jmd@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj9U7-0006O2-E2 for guix-devel@gnu.org; Thu, 24 Mar 2016 13:55:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aj9U0-0002ov-Ui for guix-devel@gnu.org; Thu, 24 Mar 2016 13:55:51 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: guix-devel@gnu.org Cc: John Darrington * gnu/packages/databses.scm (postgresql): substitute /bin/sh with location of bash binary. --- 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))) (inputs `(("readline" ,readline) ("zlib" ,zlib))) -- 2.1.4