From d0fccafeff29ca04e645b52a3d8a099e9cc64c9a Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 4 Jul 2021 17:07:06 +0000 Subject: [PATCH] 3p/nixpkgs: cairo: enable tee unconditionally --- third_party/nixpkgs/patches/pr128297.patch | 36 ++++++++++++++++++++++ third_party/nixpkgs/patches/series | 1 + 2 files changed, 37 insertions(+) create mode 100644 third_party/nixpkgs/patches/pr128297.patch diff --git a/third_party/nixpkgs/patches/pr128297.patch b/third_party/nixpkgs/patches/pr128297.patch new file mode 100644 index 0000000000..25f88f9158 --- /dev/null +++ b/third_party/nixpkgs/patches/pr128297.patch @@ -0,0 +1,36 @@ +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"; diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 324117f1f0..3da86dd1c6 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,2 +1,3 @@ patch-cherrypy.patch pomerium-fix.patch +pr128297.patch