diff mbox

[1/1] gnu: dbus-1.10.12: Fix Guix build failure.

Message ID 7c333f7e48d38f73cbfaae5db9736968a142d90d.1476752582.git.leo@famulari.name
State New
Headers show

Commit Message

Leo Famulari Oct. 18, 2016, 1:03 a.m. UTC
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(-)

Comments

Ludovic Courtès Oct. 18, 2016, 1 p.m. UTC | #1
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’.
Leo Famulari Oct. 18, 2016, 2:17 p.m. UTC | #2
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.
diff mbox

Patch

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