From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 1/1] gnu: dbus-1.10.12: Fix Guix build failure. Date: Mon, 17 Oct 2016 21:03:06 -0400 Message-ID: <7c333f7e48d38f73cbfaae5db9736968a142d90d.1476752582.git.leo@famulari.name> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwIoS-0003Rl-3f for guix-devel@gnu.org; Mon, 17 Oct 2016 21:03:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwIoO-0003Wj-67 for guix-devel@gnu.org; Mon, 17 Oct 2016 21:03:28 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36271) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwIoO-0003WT-2a for guix-devel@gnu.org; Mon, 17 Oct 2016 21:03:24 -0400 Received: from localhost.localdomain (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id 5CC3DCC080 for ; Mon, 17 Oct 2016 21:03:23 -0400 (EDT) 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: guix-devel@gnu.org Previously, building Guix failed like this: ------ ice-9/psyntax.scm:1422:32: In procedure expand-macro: ice-9/psyntax.scm:1422:32: Syntax error: gnu/packages/glib.scm:141:8: origin: extraneous field initializers (inherit) in form (origin (method url-fetch) (inherit (package-source dbus)) (uri (string-append "https://dbus.freedesktop.org/releases/dbus/dbus-" version ".tar.gz")) (sha256 (base32 "0pa71vf5c0d7k3gni06iascmplj0j5g70wbc833ayvi71d1pj2i1"))) ------ * gnu/packages/glib.scm (dbus-1.10.12): Use (patches) to apply the "dbus-helper-search-path.patch" instead of inheriting the source of dbus. --- gnu/packages/glib.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9a1459a..bfcda02 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -140,10 +140,10 @@ shared NFS home directories.") (let ((version "1.10.12")) (origin (method url-fetch) - (inherit (package-source dbus)) (uri (string-append "https://dbus.freedesktop.org/releases/dbus/dbus-" version ".tar.gz")) + (patches (search-patches "dbus-helper-search-path.patch")) (sha256 (base32 "0pa71vf5c0d7k3gni06iascmplj0j5g70wbc833ayvi71d1pj2i1"))))))) -- 2.10.1