From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48657)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fl9p4-0005wv-O4
	for guix-patches@gnu.org; Thu, 02 Aug 2018 05:23:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fl9p0-0003s5-Os
	for guix-patches@gnu.org; Thu, 02 Aug 2018 05:23:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:33229)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1fl9p0-0003rr-JF
	for guix-patches@gnu.org; Thu, 02 Aug 2018 05:23:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fl9p0-0000V1-9J
	for guix-patches@gnu.org; Thu, 02 Aug 2018 05:23:02 -0400
Subject: [bug#29951] [PATCH] WIP guix: Add wrap-script.
Resent-Message-ID: <handler.29951.B29951.15332017361850@debbugs.gnu.org>
Date: Thu, 2 Aug 2018 09:22:55 +0000
From: Nils Gillmann <ng0@n0.is>
Message-ID: <20180802092255.hmdu5p3a5y7wbm37@abyayala>
References: <20180102204434.2716-1-rekado@elephly.net>
	<CAPsKtfJDw=ba=8a3CUHnif9PkruQ-B0ui5nTY1C+1gQSXfRiGg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAPsKtfJDw=ba=8a3CUHnif9PkruQ-B0ui5nTY1C+1gQSXfRiGg@mail.gmail.com>
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Jelle Licht <jlicht@fsfe.org>
Cc: Ricardo Wurmus <rekado@elephly.net>, h.goebel@crazy-compilers.com, 29951@debbugs.gnu.org

Jelle Licht transcribed 4.1K bytes:
> 2018-01-02 21:44 GMT+01:00 Ricardo Wurmus <rekado@elephly.net>:
> 
> > * guix/build/utils.scm (wrap-script): New procedure.
> > ---
> >  guix/build/utils.scm | 101 ++++++++++++++++++++++++++++++
> > +++++++++++++++++++++
> >  1 file changed, 101 insertions(+)
> >
> > diff --git a/guix/build/utils.scm b/guix/build/utils.scm
> > index 7391307c8..a2efcb31c 100644
> > --- a/guix/build/utils.scm
> > +++ b/guix/build/utils.scm
> > @@ -3,6 +3,7 @@
> >  ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
> >  ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
> >  ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
> > +;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
> >  ;;;
> >  ;;; This file is part of GNU Guix.
> >  ;;;
> > @@ -84,6 +85,7 @@
> >              fold-port-matches
> >              remove-store-references
> >              wrap-program
> > +            wrap-script
> >              invoke
> >
> >              locale-category->string))
> > @@ -1068,6 +1070,105 @@ with definitions for VARS."
> >          (chmod prog-tmp #o755)
> >
> 
> [...]
> 
> >      (rename-file prog-tmp prog))))
> >
> > +(define wrap-script
> > +  (let ((interpreter-regex
> > +         (make-regexp
> > +          (string-append "^#! ?(/bin/sh|/gnu/store/[^/]+/bin/("
> >
> 
> Won't this be an issue for people using a customized store location?

Can't we make this substitutable at configure time?

> [snipped]
> >