From 34207efc9308914c7d0f0330abfe8abe96dcdc3a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Mon, 2 Dec 2019 19:32:26 -0500 Subject: [PATCH] cairo: enable GL support on 32-bit ARM and MIPS Mesa works fine on ARM now and this can result in obscure ARM specific bugs. --- pkgs/development/libraries/cairo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index d2e52638d071..80f8f9498d7c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -4,7 +4,7 @@ , gobjectSupport ? true, glib , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 , 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 , pdfSupport ? true , darwin