From 57248e25e6e51256e34a8e816987a4047bee853b Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 29 Jan 2013 02:39:15 +0100 Subject: librsvg: major update --- pkgs/development/libraries/librsvg/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 3f84a69e3f4..772bae24dab 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,16 +1,22 @@ -{stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco}: +{ stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco +, gdk_pixbuf, gobjectIntrospection?null, enableIntrospection?false }: -stdenv.mkDerivation { - name = "librsvg-2.34.2"; +# no introspection by default, it's too big + +stdenv.mkDerivation rec { + name = "librsvg-2.36.4"; src = fetchurl { - url = mirror://gnome/sources/librsvg/2.34/librsvg-2.34.2.tar.xz; - sha256 = "0r24xr10chmz4l3ka2zy9c2245s7svzljbw9nrda3h44bcr03rsx"; + url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; + sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; }; - buildInputs = [ libxml2 libgsf bzip2 libcroco ]; + buildInputs = [ libxml2 libgsf bzip2 libcroco gdk_pixbuf ] + ++ stdenv.lib.optional enableIntrospection [gobjectIntrospection]; propagatedBuildInputs = [ glib gtk ]; buildNativeInputs = [ pkgconfig ]; + configureFlags = ["--enable-introspection=auto"]; + # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the # relevant loader.cache here. -- cgit 1.4.1