Merge pull request #74879 from lopsided98/gtk3-armv7l

gtk3: fix build on 32-bit ARM
This commit is contained in:
Michael Raskin 2019-12-08 18:01:56 +00:00 committed by GitHub
commit 76c867afde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,7 +4,7 @@
, gobjectSupport ? true, glib , gobjectSupport ? true, glib
, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) , glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux)
, libGL ? null # libGLU libGL is no longer a big dependency , libGL ? null # libGLU libGL is no longer a big dependency
, pdfSupport ? true , pdfSupport ? true
, darwin , darwin