From f947a05759976c945e0a0c3471680c1452985336 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Oct 2009 09:17:30 +0000 Subject: [PATCH] pango needs libintl, which is provided by gettext on Darwin. svn path=/nixpkgs/trunk/; revision=17872 --- .../development/libraries/gtk-libs/2.16/pango/default.nix | 8 ++++---- .../development/libraries/gtk-libs/2.18/pango/default.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gtk-libs/2.16/pango/default.nix b/pkgs/development/libraries/gtk-libs/2.16/pango/default.nix index bbf4e63cd13..8d8934de4bf 100644 --- a/pkgs/development/libraries/gtk-libs/2.16/pango/default.nix +++ b/pkgs/development/libraries/gtk-libs/2.16/pango/default.nix @@ -2,14 +2,14 @@ args: with args; stdenv.mkDerivation rec { name = "pango-1.24.1"; - + src = fetchurl { url = "mirror://gnome/sources/pango/1.24/${name}.tar.bz2"; sha256 = "1cls9cbk6sx81101gh2pkiri8v14shqpvy37cydbh8scs4yk8370"; }; - - buildInputs = [pkgconfig]; - + + buildInputs = [pkgconfig] ++ (if stdenv.system == "i686-darwin" then [gettext] else []); + propagatedBuildInputs = [x11 glib cairo libpng]; meta = { diff --git a/pkgs/development/libraries/gtk-libs/2.18/pango/default.nix b/pkgs/development/libraries/gtk-libs/2.18/pango/default.nix index 0df05a8684f..b152aaba5ef 100644 --- a/pkgs/development/libraries/gtk-libs/2.18/pango/default.nix +++ b/pkgs/development/libraries/gtk-libs/2.18/pango/default.nix @@ -2,14 +2,14 @@ args: with args; stdenv.mkDerivation rec { name = "pango-1.26.0"; - + src = fetchurl { url = "mirror://gnome/sources/pango/1.26/${name}.tar.bz2"; sha256 = "1hx6v6w3xk9wfcrb26gg7rrfl6m6ykxk2bqm67aqdzql4vysxgz1"; }; - - buildInputs = [pkgconfig]; - + + buildInputs = [pkgconfig] ++ (if stdenv.system == "i686-darwin" then [gettext] else []); + propagatedBuildInputs = [x11 glib cairo libpng]; meta = {