guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


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

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 via email to

[Prev in Thread] Current Thread [Next in Thread]