From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: Re: [PATCH] gnu: Add mash. Date: Wed, 31 Aug 2016 22:16:21 +0200 Message-ID: <87zinsae3u.fsf@elephly.net> References: <87h9a2yweu.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> <20160831194426.GC22495@jasmine> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bfBw2-0002bx-D4 for guix-devel@gnu.org; Wed, 31 Aug 2016 16:16:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bfBvx-0004Lo-D0 for guix-devel@gnu.org; Wed, 31 Aug 2016 16:16:34 -0400 Received: from sender163-mail.zoho.com ([74.201.84.163]:24082) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bfBvx-0004L1-66 for guix-devel@gnu.org; Wed, 31 Aug 2016 16:16:29 -0400 In-reply-to: <20160831194426.GC22495@jasmine> 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: Leo Famulari Cc: guix-devel@gnu.org Leo Famulari writes: > On Tue, Aug 30, 2016 at 06:54:49PM +0100, Marius Bakke wrote: >> * gnu/packages/bioinformatics.scm (mash): New variable. > > Thanks! > >> + (add-after 'unpack 'fix-includes >> + (lambda _ >> + (substitute* '("src/mash/Sketch.cpp" "src/mash/CommandFind.cpp") >> + (("^#include \"kseq\\.h\"") >> + "#include \"htslib/kseq.h\"")) >> + #t)) >> + (add-before 'configure 'autoconf >> + (lambda _ (zero? (system* "autoconf"))))))) >> + (native-inputs >> + `(("autoconf" ,autoconf) >> + ("capnproto" ,capnproto) >> + ("htslib" ,htslib))) > > Does it only need to use capnproto and htslib while building? Okay if > so. Looking at the substitution in “fix-includes” htslib probably should be a regular input. ~~ Ricardo