diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-12-08 18:01:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-08 18:01:56 +0000 |
| commit | 76c867afde1d30d49c4899d6eedb1d8abe520acb (patch) | |
| tree | 6e43742b2ec3980160a914f2e75a1e4fe305bb67 /pkgs/development/libraries | |
| parent | 5bba8c20e4141a4d22e9198830056fb631e702f3 (diff) | |
| parent | 34207efc9308914c7d0f0330abfe8abe96dcdc3a (diff) | |
| download | nixpkgs-76c867afde1d30d49c4899d6eedb1d8abe520acb.tar nixpkgs-76c867afde1d30d49c4899d6eedb1d8abe520acb.tar.gz nixpkgs-76c867afde1d30d49c4899d6eedb1d8abe520acb.tar.bz2 nixpkgs-76c867afde1d30d49c4899d6eedb1d8abe520acb.tar.lz nixpkgs-76c867afde1d30d49c4899d6eedb1d8abe520acb.tar.xz nixpkgs-76c867afde1d30d49c4899d6eedb1d8abe520acb.tar.zst nixpkgs-76c867afde1d30d49c4899d6eedb1d8abe520acb.zip | |
Merge pull request #74879 from lopsided98/gtk3-armv7l
gtk3: fix build on 32-bit ARM
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index d2e52638d07..80f8f9498d7 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 |