gdk-pixbuf-2.24

svn path=/nixpkgs/trunk/; revision=29378

pkgs/development/libraries/gdk-pixbuf/2.22.x.nix

@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs }:
-
-stdenv.mkDerivation rec {
-  name = "gdk-pixbuf-2.22.1";
-  
-  src = fetchurl {
-    url = "mirror://gnome/sources/gdk-pixbuf/2.22/${name}.tar.bz2";
-    sha256 = "6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d";
-  };
-
-  # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ pkgconfig glib libtiff libjpeg libpng xlibs.xlibs ];
-  
-  postInstall = "rm -rf $out/share/gtk-doc";
-  
-  meta = {
-    description = "A library for image loading and manipulation";
-
-    homepage = http://library.gnome.org/devel/gdk-pixbuf/;
-
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/development/libraries/gdk-pixbuf/2.24.x.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl_gnome, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs
+, xz, jasper }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "gdk-pixbuf";
+    major = "2"; minor = "24"; patchlevel = "0"; extension = "xz";
+    sha256 = "19r89nxqlpmd0ykmklz2z99dvad9svr5ndiclk7c2h84lhx1vhb7";
+  };
+
+  # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
+  buildInputs = [ xlibs.xlibs ];
+
+  buildNativeInputs = [ pkgconfig xz ];
+
+  propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
+
+  configureFlags = "--with-libjasper";
+
+  postInstall = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "A library for image loading and manipulation";
+
+    homepage = http://library.gnome.org/devel/gdk-pixbuf/;
+
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -3550,7 +3550,7 @@ let
 
     pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { };
 
-    gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.22.x.nix { };
+    gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };
 
     gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { };