[Nix-dev] [PATCH 3/4] pango needs libintl, which is provided by gettext on Darwin.

[Peter Simons]

---
 .../libraries/gtk-libs/2.16/pango/default.nix      |    8 ++++----
 .../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 bbf4e63..8d8934d 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 0df05a8..b152aab 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 = {
-- 
1.6.4.4

_______________________________________________
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev