From e8a30536b6019aa4e5c72262d2ddf1a8fb0b9d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Sep 2011 12:07:24 +0000 Subject: [PATCH] Cairo: Add dependency on Gettext on non-GNU systems; build it. svn path=/nixpkgs/trunk/; revision=29495 --- pkgs/development/libraries/cairo/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 62e907264d5..ca3e53e64f4 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -5,6 +5,7 @@ , gobjectSupport ? true, glib , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , zlib, libpng, pixman, libxcb ? null, xcbutil ? null +, gettext }: assert postscriptSupport -> zlib != null; @@ -22,7 +23,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] - ++ stdenv.lib.optional gobjectSupport glib; + ++ stdenv.lib.optional gobjectSupport glib + + # On non-GNU systems we need GNU Gettext for libintl. + ++ stdenv.lib.optional (!stdenv.isLinux) gettext; propagatedBuildInputs = [ freetype ] ++ @@ -62,5 +66,7 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; licenses = [ "LGPLv2+" "MPLv1" ]; + + platforms = stdenv.lib.platforms.all; }; }