From a0893d472e0ef8335015fe8a710df2e348a9ba69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 20 Jul 2013 23:15:37 +0200 Subject: [PATCH] Buidling cairo without gl on arm and mips Mesa didn't build for arm, and I don't think anyone with arm wants mesa now. And I needed cairo for rrdtool. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7afc75b0a57..86d1059bda4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4219,7 +4219,8 @@ let pixman = callPackage ../development/libraries/pixman { }; cairo = callPackage ../development/libraries/cairo { - glSupport = config.cairo.gl or stdenv.isLinux; + glSupport = config.cairo.gl or (stdenv.isLinux && + !stdenv.isArm && !stdenv.isMips); }; cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { }; cairomm = callPackage ../development/libraries/cairomm { };