From mboxrd@z Thu Jan  1 00:00:00 1970
From: Federico Beffa <beffa@ieee.org>
Subject: [PATCH 2/6] build-system/emacs: Use "emacs" from native-inputs if
	specified.
Date: Fri, 20 May 2016 09:15:31 +0200
Message-ID: <CAKrPhPOCzoxW4qA9WXAM7+QTjp18jUGxyaC1=7O2z73DD6GBAQ@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34629)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <federico.beffa@gmail.com>) id 1b3eej-0000jz-HZ
	for guix-devel@gnu.org; Fri, 20 May 2016 03:15:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <federico.beffa@gmail.com>) id 1b3eei-0003h7-9G
	for guix-devel@gnu.org; Fri, 20 May 2016 03:15:33 -0400
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: alezost@gmail.com, Guix-devel <guix-devel@gnu.org>, =?UTF-8?Q?Ludovic_Court=C3=A8s?= <ludo@gnu.org>

Alex Kost <alezost@gmail.com> writes:

> * guix/build-system/emacs.scm (lower): Do not add "emacs" to
>   build-inputs if it is already specified in the native-inputs.
> @@ -73,8 +75,16 @@
>
>                          ;; Keep the standard inputs of 'gnu-build-system'.
>                          ,@(standard-packages)))
> -         (build-inputs `(("emacs" ,emacs)
> -                         ,@native-inputs))
> +         ;; Add emacs to build-inputs only if native-inputs do not contain
> +         ;; emacs already.  This allows us to use non-default emacs for
> +         ;; building.
> +         (build-inputs (if (find (match-lambda
> +                                   (("emacs" _ ...) #t)
> +                                   (_ #f))
> +                                 native-inputs)
> +                           native-inputs
> +                           `(("emacs" ,emacs)
> +                             ,@native-inputs)))

Note that for the interpreter we normally use a keyword, here #:emacs
(in a similar way as, say, for the python-build-system there is
#:python).  Your code overwrites its effect in a non-transparent way.

Please use the keyword in the packages where you need an emacs package
different from the default one, or remove all the code related to the
keyword.  If you opt for the second one, please be consistent and do the
same for all other build systems.

Fede