From a8ecef63af31575e45751fa99898fc0065b05e68 Mon Sep 17 00:00:00 2001 From: Default email Date: Sat, 3 Jul 2021 00:11:41 -0300 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 09c38c29f2c719cd76ca17a596c2fdac9e186ceb --- .../nixpkgs/pkgs/development/libraries/cairo/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix index 839b7e9f40..ab439dbc06 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -64,14 +64,15 @@ in stdenv.mkDerivation rec { ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? - configureFlags = (if stdenv.isDarwin then [ + configureFlags = [ + "--enable-tee" + ] ++ (if stdenv.isDarwin then [ "--disable-dependency-tracking" "--enable-quartz" "--enable-quartz-font" "--enable-quartz-image" "--enable-ft" - ] else ([ "--enable-tee" ] - ++ optional xcbSupport "--enable-xcb" + ] else (optional xcbSupport "--enable-xcb" ++ optional glSupport "--enable-gl" ++ optional pdfSupport "--enable-pdf" )) ++ optional (!x11Support) "--disable-xlib";