glv pushed a commit to branch core-updates-frozen
in repository guix.
commit cdb63b192c0756e2cfbe2cf4336ea3670409df57
Author: Sarah Morgensen <[email protected]>
AuthorDate: Sat Sep 4 21:36:53 2021 -0700
gnu: libappindicator: Fix build for GCC 10.
* gnu/packages/freedesktop.scm (libappindicator)[source]: Add snippet to
prevent declaring _PyGObject_API twice.
Signed-off-by: Guillaume Le Vaillant <[email protected]>
---
gnu/packages/freedesktop.scm | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index a7766ed..f797269 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -24,6 +24,7 @@
;;; Copyright © 2020 Raghav Gururajan <[email protected]>
;;; Copyright © 2021 Brendan Tildesley <[email protected]>
;;; Copyright © 2021 pineapples <[email protected]>
+;;; Copyright © 2021 Sarah Morgensen <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2210,6 +2211,13 @@ useful with system integration.")
"https://launchpad.net/libappindicator/";
(version-major+minor version) "/" version
"/+download/libappindicator-" version ".tar.gz"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Fix 'multiple definitions' error from GCC 10
+ (substitute* "bindings/python/appindicatormodule.c"
+ (("^#include <pygobject.h>" all)
+ (string-append "#define NO_IMPORT_PYGOBJECT\n" all)))))
(sha256
(base32
"17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m"))))
