unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH 1/1] gnu: dbus-1.10.12: Fix Guix build failure.
@ 2016-10-18  1:03 Leo Famulari
  2016-10-18 13:00 ` Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: Leo Famulari @ 2016-10-18  1:03 UTC (permalink / raw)
  To: guix-devel

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] gnu: dbus-1.10.12: Fix Guix build failure.
  2016-10-18  1:03 [PATCH 1/1] gnu: dbus-1.10.12: Fix Guix build failure Leo Famulari
@ 2016-10-18 13:00 ` Ludovic Courtès
  2016-10-18 14:17   ` Leo Famulari
  0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2016-10-18 13:00 UTC (permalink / raw)
  To: Leo Famulari; +Cc: guix-devel

Leo Famulari <leo@famulari.name> skribis:

> 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")))
> ------

I don’t get that error.  Are you using Guile 2.1?

Ludo’.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] gnu: dbus-1.10.12: Fix Guix build failure.
  2016-10-18 13:00 ` Ludovic Courtès
@ 2016-10-18 14:17   ` Leo Famulari
  0 siblings, 0 replies; 3+ messages in thread
From: Leo Famulari @ 2016-10-18 14:17 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: guix-devel

On Tue, Oct 18, 2016 at 03:00:50PM +0200, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > 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")))
> > ------
> 
> I don’t get that error.  Are you using Guile 2.1?

For those reading along, Mark fixed this problem (in a different way) in
c9a71c6fdab6914dd648b76c349c3af9018cad35.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-10-18 14:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-18  1:03 [PATCH 1/1] gnu: dbus-1.10.12: Fix Guix build failure Leo Famulari
2016-10-18 13:00 ` Ludovic Courtès
2016-10-18 14:17   ` Leo Famulari

Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).