diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index d21f303e741..72ea24c9f8a 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig x11 fontconfig xlibs.libXrender ] + [ pkgconfig x11 fontconfig ] + ++ stdenv.lib.optional (!stdenv.isDarwin) xlibs.libXrender ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] # On non-GNU systems we need GNU Gettext for libintl. diff --git a/pkgs/development/libraries/pango/1.30.x.nix b/pkgs/development/libraries/pango/1.30.x.nix index 2fd828a8737..c32891b95cf 100644 --- a/pkgs/development/libraries/pango/1.30.x.nix +++ b/pkgs/development/libraries/pango/1.30.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: +{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, fontconfig }: stdenv.mkDerivation rec { name = "pango-1.30.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ]; nativeBuildInputs = [ pkgconfig ];