From cdb63b192c0756e2cfbe2cf4336ea3670409df57 Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sat, 4 Sep 2021 21:36:53 -0700 Subject: 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 --- gnu/packages/freedesktop.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a7766edf04..f7972695e5 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 pineapples +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; 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 " all) + (string-append "#define NO_IMPORT_PYGOBJECT\n" all))))) (sha256 (base32 "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m")))) -- cgit 1.4.1