From e8a30536b6019aa4e5c72262d2ddf1a8fb0b9d98 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 26 Sep 2011 12:07:24 +0000
Subject: 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(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 62e907264d5e..ca3e53e64f40 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;
   };
 }
-- 
cgit 1.4.1


From 5da4cd69fc527e0f8355b78394d55d150b513640 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 26 Sep 2011 13:13:45 +0000
Subject: imlib2-1.4.5

svn path=/nixpkgs/trunk/; revision=29496
---
 pkgs/development/libraries/imlib2/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index d5c5424c077d..83adb16bbc8d 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -1,12 +1,18 @@
 { stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "imlib2-1.4.4";
+stdenv.mkDerivation rec {
+  name = "imlib2-1.4.5";
   
   src = fetchurl {
-    url = mirror://sourceforge/enlightenment/imlib2-1.4.4.tar.gz;
-    sha256 = "163162aifak8ya17brzqwjlr8ywz40s2s3573js5blcc1g4m5pm4";
+    url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";
+    sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14";
   };
   
-  buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 pkgconfig ];
+  buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ];
+
+  buildNativeInputs = [ pkgconfig ];
+
+  meta = {
+    platforms = stdenv.lib.platforms.gnu; # random choice
+  };
 }
-- 
cgit 1.4.1