From ffc2c539b4d2b905ca99ceda99a4af81fec8e459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 23 Oct 2014 18:45:37 +0200 Subject: [PATCH] pango: fix eval on darwin This was a cherry-pick silent conflict. The gettext is provided by libintlOrEmpty where needed. --- pkgs/development/libraries/pango/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 89075ca25ba..45ca9cb98e8 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; optional (!stdenv.isDarwin) gobjectIntrospection # build problems of itself and flex - ++ optionals stdenv.isDarwin [ gettext fontconfig ]; + ++ optionals stdenv.isDarwin [ fontconfig ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;