From 2ee854b2b30a6c5f6b8bf456bbf4d3fa3a572607 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 5 Oct 2011 15:09:09 +0000
Subject: svn merge trunk

svn path=/nixpkgs/branches/libpng15/; revision=29662
---
 pkgs/development/libraries/babl/default.nix |  8 ++++----
 pkgs/development/libraries/gegl/default.nix | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 2464a09f51aa..77ddecd71c0f 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "babl-0.0.22";
+stdenv.mkDerivation rec {
+  name = "babl-0.1.4";
 
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2;
-    sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s";
+    url = "ftp://ftp.gimp.org/pub/babl/0.1/${name}.tar.bz2";
+    sha256 = "0cz7zw206bb87c0n0h54h4wlkaa3hx3wsia30mgq316y50jk2djv";
   };
 
   meta = { 
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 3b1900ae89c5..8fa87d90be2e 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -1,17 +1,20 @@
 { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
-, librsvg, pango, gtk }:
+, librsvg, pango, gtk, bzip2 }:
         
-stdenv.mkDerivation {
-  name = "gegl-0.0.22";
+stdenv.mkDerivation rec {
+  name = "gegl-0.1.6";
 
   src = fetchurl {
-    url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2;
-    sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5";
+    url = "ftp://ftp.gimp.org/pub/gegl/0.1/${name}.tar.bz2";
+    sha256 = "1l966ygss2zkksyw62nm139v2abfzbqqrj0psizvbgzf4mb24rm1";
   };
 
-  configureFlags = "--disable-docs"; # needs fonts otherwise  don't know how to pass them
+  # needs fonts otherwise  don't know how to pass them
+  configureFlags = "--disable-docs";
 
-  buildInputs = [ pkgconfig glib babl libpng cairo libjpeg librsvg pango gtk ];
+  buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 ];
+
+  buildNativeInputs = [ pkgconfig ];
 
   meta = { 
     description = "Graph-based image processing framework";
-- 
cgit 1.4.1