public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

librsvg: drop gtk2 dep. by default, add optional gtk3 dep.

Browse Source 
Tried to build some affected packages, seems OK.
This commit is contained in:
Vladimír Čunát 2013-02-04 23:35:20 +01:00
parent bc1e83aa1c
commit 2c700f3b4a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/librsvg/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco { stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo
, gdk_pixbuf, gobjectIntrospection?null, enableIntrospection?false }: , libxml2, libgsf, bzip2, libcroco
, gtk2 ? null, gtk3 ? null
, gobjectIntrospection ? null, enableIntrospection ? false }:
# no introspection by default, it's too big # 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"; url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz";
sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h";
}; };
buildInputs = [ libxml2 libgsf bzip2 libcroco gdk_pixbuf ] buildInputs = [ libxml2 libgsf bzip2 libcroco pango cairo ]
++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ];
propagatedBuildInputs = [ glib gtk ]; propagatedBuildInputs = [ glib gdk_pixbuf gtk2 gtk3 ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
configureFlags = ["--enable-introspection=auto"]; configureFlags = ["--enable-introspection=auto"];

4
pkgs/top-level/all-packages.nix
View File

@ -4368,7 +4368,9 @@ let
libqalculate = callPackage ../development/libraries/libqalculate { }; 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 { }; librsync = callPackage ../development/libraries/librsync { };