37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
|
From 6102c4a326636fe653aad42b9e5cc79db826afa4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
|
||
|
|
Date: Sun, 27 Jun 2021 12:47:40 +0200
|
||
|
|
Subject: [PATCH] cairo: enable tee unconditionally
|
||
|
|
|
||
|
|
The pycairo test suite fails on darwin because cairo's tee backend is
|
||
|
|
not enabled: https://github.com/pygobject/pycairo/issues/238
|
||
|
|
Since cairo builds on darwin fine with tee, there seems to be no
|
||
|
|
reason not to enable it.
|
||
|
|
---
|
||
|
|
pkgs/development/libraries/cairo/default.nix | 7 ++++---
|
||
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
|
||
|
|
index 839b7e9f40b94c..ab439dbc065794 100644
|
||
|
|
--- a/pkgs/development/libraries/cairo/default.nix
|
||
|
|
+++ b/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";
|