From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH 3/4] gnu: xapian: Use 'modify-phases'. Date: Mon, 17 Oct 2016 14:00:15 -0400 Message-ID: <20161017180015.GB31629@jasmine> References: <20161017165506.17750-1-mbakke@fastmail.com> <20161017165506.17750-4-mbakke@fastmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwCCy-0008Py-W7 for guix-devel@gnu.org; Mon, 17 Oct 2016 14:00:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwCCv-0004pf-Qu for guix-devel@gnu.org; Mon, 17 Oct 2016 14:00:21 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:57332) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwCCv-0004pT-Na for guix-devel@gnu.org; Mon, 17 Oct 2016 14:00:17 -0400 Content-Disposition: inline In-Reply-To: <20161017165506.17750-4-mbakke@fastmail.com> 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" To: Marius Bakke Cc: guix-devel@gnu.org On Mon, Oct 17, 2016 at 05:55:05PM +0100, Marius Bakke wrote: > * gnu/packages/search.scm (xapian)[arguments]: Use 'modify-phases'. > + `(#:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'patch-remotetcp-harness > + (lambda _ > + (substitute* "tests/harness/backendmanager_remotetcp.cc" > + (("/bin/sh") (which "bash")))))))) Please change it to use (which "sh") instead. Bash changes its behavior based on whether it is called as `bash` or `sh` (see Invocation in bash(1)). Otherwise LGTM.