summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-01-29 02:39:15 +0100
committerVladimír Čunát <vcunat@gmail.com>2013-01-29 15:15:08 +0100
commit57248e25e6e51256e34a8e816987a4047bee853b (patch)
treec2643d1c29be503e02ad929ccd3fbd77aa3d2d06
parent5ed188df5e788b5e23a7b9fc01d54f55272f8775 (diff)
downloadnixpkgs-57248e25e6e51256e34a8e816987a4047bee853b.tar
nixpkgs-57248e25e6e51256e34a8e816987a4047bee853b.tar.gz
nixpkgs-57248e25e6e51256e34a8e816987a4047bee853b.tar.bz2
nixpkgs-57248e25e6e51256e34a8e816987a4047bee853b.tar.lz
nixpkgs-57248e25e6e51256e34a8e816987a4047bee853b.tar.xz
nixpkgs-57248e25e6e51256e34a8e816987a4047bee853b.tar.zst
nixpkgs-57248e25e6e51256e34a8e816987a4047bee853b.zip
librsvg: major update
-rw-r--r--pkgs/development/libraries/librsvg/default.nix18
1 files changed, 12 insertions, 6 deletions
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.