summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-07-03 15:41:21 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-07-03 15:41:21 +0200
commit1ea1ce18ade18468e4c00a23ccfa75197c3b62ad (patch)
tree695dc03755fd02ec10802ac379cfd7d9c0e2ec3f /gnu
parentf03cda4d1e4415a5c1e83b4c8280724cd0ffa05c (diff)
downloadguix-1ea1ce18ade18468e4c00a23ccfa75197c3b62ad.tar.gz
gnu: sdl2: Fix FTBFS with GCC7.
* gnu/packages/sdl.scm (sdl2)[arguments]: Add <#:make-flags>.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/sdl.scm10
1 files changed, 10 insertions, 0 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index b6b28b7d06..c012dbced1 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
 ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -121,6 +122,15 @@ joystick, and graphics hardware.")
        ((#:configure-flags flags)
         `(append '("--disable-wayland-shared" "--enable-video-kmsdrm"
                    "--disable-kmsdrm-shared")
+                 ,flags))
+       ((#:make-flags flags ''())
+        ;; Add the Fcitx header files to GCCs "system header" search path
+        ;; in order to suppress compiler warnings induced by those:
+        ;;   .../include/fcitx-utils/utarray.h:178:9: error: ISO C90 forbids
+        ;;   mixed declarations and code [-Werror=declaration-after-statement]
+        `(append (list (string-append "C_INCLUDE_PATH="
+                                      (assoc-ref %build-inputs "fcitx")
+                                      "/include"))
                  ,flags))))
     (inputs
      ;; SDL2 needs to be built with ibus support otherwise some systems