diff options
Diffstat (limited to 'gnu/packages/sdl.scm')
| -rw-r--r-- | gnu/packages/sdl.scm | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 26c9bd5eb3..8ac9213db3 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -130,15 +130,6 @@ 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 @@ -240,7 +231,7 @@ other supporting functions for SDL.") ;; propagated input because the pkg-config file refers to SDL's pkg-config ;; file. (propagated-inputs `(("sdl" ,sdl) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) @@ -557,7 +548,7 @@ directory.") `(("pkg-config" ,pkg-config) ;; Required by test suite. ("xorg-server" ,xorg-server) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) (inputs `(("guile" ,guile-2.2) ("sdl-union" ,(sdl-union)))) |