all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: guix-devel@gnu.org
Subject: [PATCH 1/1] gnu: dbus-1.10.12: Fix Guix build failure.
Date: Mon, 17 Oct 2016 21:03:06 -0400	[thread overview]
Message-ID: <7c333f7e48d38f73cbfaae5db9736968a142d90d.1476752582.git.leo@famulari.name> (raw)

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

             reply	other threads:[~2016-10-18  1:03 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-18  1:03 Leo Famulari [this message]
2016-10-18 13:00 ` [PATCH 1/1] gnu: dbus-1.10.12: Fix Guix build failure Ludovic Courtès
2016-10-18 14:17   ` Leo Famulari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7c333f7e48d38f73cbfaae5db9736968a142d90d.1476752582.git.leo@famulari.name \
    --to=leo@famulari.name \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.