From patchwork Sat May 21 11:57:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kost X-Patchwork-Id: 12441 Received: (qmail 27205 invoked by uid 89); 21 May 2016 11:58:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.1 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Sat, 21 May 2016 11:58:27 +0000 Received: from localhost ([::1]:40131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b45Y1-0007UT-NC for patchwork@sourceware.org; Sat, 21 May 2016 07:58:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b45Xt-0007Ri-Tb for guix-devel@gnu.org; Sat, 21 May 2016 07:58:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b45Xo-0003p2-IK for guix-devel@gnu.org; Sat, 21 May 2016 07:58:17 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:35385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b45Xo-0003oi-AG for guix-devel@gnu.org; Sat, 21 May 2016 07:58:12 -0400 Received: by mail-lf0-x241.google.com with SMTP id p10so3965713lfb.2 for ; Sat, 21 May 2016 04:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=+Oei7eo+9Jha1HysO0AxPCfG+MVs2WNAdFE7SEG/SEw=; b=ViOygZcUSspQGyE4J0VsoXugxVCFiVjakuM1jOZfjMqbLolTCSfTF37depnKwPwS6V wFl4EK2IsM4uoXohEh8++gYnCjVgDmTqoxAFPGWPbA7duv3FCXj45YEQI2ayQ0GBP+FX O3g6ZKDEiZnnqSrjRWk9Jx0tTcUr/SQ/jUfv65/y58cYFa4ZK/g6wnVzLAMnLD7idEUA 1qXuJKexfuAEhUcUd6MgA5YAWqZ0GHqpGFz2Xwm7SMAJGWPkpTgK4Xw6OJ0B9s2wwL2f nAuhdEFIf+u/dxy6KEAPvF+H4EKW7Jo+csG6M8YsOsHrEe3KJqrf9AGS7CFUkrSptlA9 jgCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=+Oei7eo+9Jha1HysO0AxPCfG+MVs2WNAdFE7SEG/SEw=; b=YzYysZ/pyRzr7MF0p/0fNyWggxRRtJ1iF1iKnuV6sf1nhC4Tiil+gyWC1OEpuY8Qbf xslrBSEJE8ll6LmZVykVNaAGGphX7F6uSW4IRzsY5bH/rqPxi/n4EhzzLsxHTdrywlPY gfxLa5hwCURYxktW47LStgvWDK8ru1fa10tJc9n8FMCWgFn4uxGtah43uaXrkQaps5SX xnwn9JdVzPi86EgZkmsf9npcVvWvuhrMUlSXm1Thpj4FKJmLs/yiaHQnDVX1zIQY1/uE 4ruv6v/b6T4NrRNVJBAC2jYSKO73Ta3XiwtUEqEaRwMqaejPVMCB5WyERdcAjltB5LKq IXlA== X-Gm-Message-State: AOPr4FX1d/VYpQsOqJYVa9/tk3LEH5MyR3/RBjBgMVuDH1btltK3Hi1vQZk3H64acNxTGg== X-Received: by 10.25.166.77 with SMTP id p74mr2323735lfe.48.1463831890527; Sat, 21 May 2016 04:58:10 -0700 (PDT) Received: from localhost.localdomain ([217.107.192.156]) by smtp.gmail.com with ESMTPSA id j2sm4184680lfb.13.2016.05.21.04.58.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 21 May 2016 04:58:10 -0700 (PDT) From: Alex Kost To: guix-devel@gnu.org Subject: [PATCH 2/4] build-system/emacs: Use 'emacs-minimal' by default. Date: Sat, 21 May 2016 14:57:53 +0300 Message-Id: <1463831875-28373-3-git-send-email-alezost@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1463831875-28373-1-git-send-email-alezost@gmail.com> References: <1463831875-28373-1-git-send-email-alezost@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::241 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list 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+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" * guix/build-system/emacs.scm (default-emacs): Use 'emacs-minimal'. * gnu/packages/emacs.scm (emacs-auctex): Use 'emacs'. --- gnu/packages/emacs.scm | 3 +++ guix/build-system/emacs.scm | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c032869..fb1a3db 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1006,6 +1006,9 @@ as a library for other Emacs packages.") (base32 "1pmki8hdjjikxlvip3pzi350bln3gcimr27yjf0xfwjvnp5hh9nc")))) (build-system emacs-build-system) + ;; We use 'emacs' because AUCTeX requires dbus at compile time + ;; ('emacs-minimal' does not provide dbus). + (arguments `(#:emacs ,emacs)) (native-inputs `(("perl" ,perl))) (home-page "http://www.gnu.org/software/auctex/") diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index 03c1eb2..a798200 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -47,11 +47,7 @@ "Return the default Emacs package." ;; Lazily resolve the binding to avoid a circular dependency. (let ((emacs-mod (resolve-interface '(gnu packages emacs)))) - ;; we use 'emacs' instead of 'emacs-no-x' because the latter appears not - ;; to be loading some macros and causes problems to some packages. For - ;; example, with the latter AUCTeX gives the error message: - ;; "(invalid-function dbus-ignore-errors)". - (module-ref emacs-mod 'emacs))) + (module-ref emacs-mod 'emacs-minimal))) (define* (lower name #:key source inputs native-inputs outputs system target