From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH 09/10] gnu: Add ocaml-js-build-tools. Date: Mon, 30 Jan 2017 10:22:13 +0100 Message-ID: <87inowgawq.fsf@gnu.org> References: <20170127221228.4370-1-julien@lepiller.eu> <20170127221228.4370-10-julien@lepiller.eu> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cY8AF-0001o1-VX for guix-devel@gnu.org; Mon, 30 Jan 2017 04:22:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cY8AC-0006uf-1a for guix-devel@gnu.org; Mon, 30 Jan 2017 04:22:20 -0500 In-Reply-To: <20170127221228.4370-10-julien@lepiller.eu> (Julien Lepiller's message of "Fri, 27 Jan 2017 23:12:27 +0100") 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: Julien Lepiller Cc: guix-devel@gnu.org Julien Lepiller skribis: > +++ b/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch > @@ -0,0 +1,39 @@ > +This patch adds a --libdir option to opam-installer so it installs the p= lugin > +in the specified directory rather than in the default one (ocaml's direc= tory in > +the store, which is forbidden). > +diff -aur package.pristine/Makefile package.new/Makefile > +--- package.pristine/Makefile 2016-02-06 01:55:14.650150309 +0100 > ++++ package.new/Makefile 2016-02-06 01:57:56.012174364 +0100 > +@@ -29,26 +29,26 @@ > + ocaml -I js-utils js-utils/gen_install.ml > + > + install: $(NAME).install > +- opam-installer -i --prefix $(PREFIX) $(NAME).install > ++ opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install > + > + uninstall: $(NAME).install > +- opam-installer -u --prefix $(PREFIX) $(NAME).install > ++ opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install On second thought, I think it=E2=80=99d be simpler and more maintainable to= do this as a substitution in the snippet. WDYT? (It will also avoid =E2=80=98guix lint=E2=80=99 complaints about the patch = file name not matching the package name. :-)) Ludo=E2=80=99.