From bd878ef0832d7eed1e148268b716ce20ac3cfaab Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Fri, 15 Mar 2019 10:10:29 +0100 Subject: [PATCH] pango: make x11 optional, disabled on darwin --- pkgs/development/libraries/pango/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index ef60b331fc6c..b67db91ef642 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz +{ stdenv, fetchurl, pkgconfig, cairo, harfbuzz , libintl, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , meson, ninja, glib +, x11Support? !stdenv.isDarwin, libXft }: with stdenv.lib; @@ -32,7 +33,8 @@ in stdenv.mkDerivation rec { CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo glib libXft libintl ]; + propagatedBuildInputs = [ cairo glib libintl ] ++ + optional x11Support libXft; patches = [ (fetchurl {