diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-04 23:35:20 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-21 21:33:49 +0100 |
commit | 2c700f3b4ac402853f9c743b5c1f22050e0245af (patch) | |
tree | 61e0a5b79a6bc62f45240f303059ef8eacd255de /pkgs/development/libraries/librsvg | |
parent | bc1e83aa1c2d12c23b6939ae3cfc0ba75a988fd3 (diff) | |
download | nixpkgs-2c700f3b4ac402853f9c743b5c1f22050e0245af.tar nixpkgs-2c700f3b4ac402853f9c743b5c1f22050e0245af.tar.gz nixpkgs-2c700f3b4ac402853f9c743b5c1f22050e0245af.tar.bz2 nixpkgs-2c700f3b4ac402853f9c743b5c1f22050e0245af.tar.lz nixpkgs-2c700f3b4ac402853f9c743b5c1f22050e0245af.tar.xz nixpkgs-2c700f3b4ac402853f9c743b5c1f22050e0245af.tar.zst nixpkgs-2c700f3b4ac402853f9c743b5c1f22050e0245af.zip |
librsvg: drop gtk2 dep. by default, add optional gtk3 dep.
Tried to build some affected packages, seems OK.
Diffstat (limited to 'pkgs/development/libraries/librsvg')
-rw-r--r-- | pkgs/development/libraries/librsvg/default.nix | 12 |
1 files changed, 7 insertions, 5 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"]; |