From 2c700f3b4ac402853f9c743b5c1f22050e0245af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Feb 2013 23:35:20 +0100
Subject: [PATCH] librsvg: drop gtk2 dep. by default, add optional gtk3 dep.

Tried to build some affected packages, seems OK.
---
 pkgs/development/libraries/librsvg/default.nix | 12 +++++++-----
 pkgs/top-level/all-packages.nix                |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 1ac47f890ab..13385dfb65c 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco
-, gdk_pixbuf, gobjectIntrospection?null, enableIntrospection?false }:
+{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo
+, libxml2, libgsf, bzip2, libcroco
+, gtk2 ? null, gtk3 ? null
+, gobjectIntrospection ? null, enableIntrospection ? false }:
 
 # no introspection by default, it's too big
 
@@ -10,9 +12,9 @@ stdenv.mkDerivation rec {
     url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz";
     sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h";
   };
-  buildInputs = [ libxml2 libgsf bzip2 libcroco gdk_pixbuf ]
-    ++ stdenv.lib.optional enableIntrospection [gobjectIntrospection];
-  propagatedBuildInputs = [ glib gtk ];
+  buildInputs = [ libxml2 libgsf bzip2 libcroco pango cairo ]
+    ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ];
+  propagatedBuildInputs = [ glib gdk_pixbuf gtk2 gtk3 ];
   nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = ["--enable-introspection=auto"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6a1feff6bd..0006a629e4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4368,7 +4368,9 @@ let
 
   libqalculate = callPackage ../development/libraries/libqalculate { };
 
-  librsvg = callPackage ../development/libraries/librsvg { };
+  librsvg = callPackage ../development/libraries/librsvg {
+    gtk2 = null; gtk3 = null; # neither gtk version by default
+  };
 
   librsync = callPackage ../development/libraries/librsync { };