diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-26 11:54:16 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-26 12:00:43 +0200 |
| commit | d7e97e07a32a24af5d104757fa563e46c370cbfe (patch) | |
| tree | b7b3c224baea2bc5f30a8907318c5370e49a5f51 /pkgs/development/libraries/librsvg | |
| parent | 761fc1a45722898e05be5a960eb19432a506b639 (diff) | |
| download | nixpkgs-d7e97e07a32a24af5d104757fa563e46c370cbfe.tar nixpkgs-d7e97e07a32a24af5d104757fa563e46c370cbfe.tar.gz nixpkgs-d7e97e07a32a24af5d104757fa563e46c370cbfe.tar.bz2 nixpkgs-d7e97e07a32a24af5d104757fa563e46c370cbfe.tar.lz nixpkgs-d7e97e07a32a24af5d104757fa563e46c370cbfe.tar.xz nixpkgs-d7e97e07a32a24af5d104757fa563e46c370cbfe.tar.zst nixpkgs-d7e97e07a32a24af5d104757fa563e46c370cbfe.zip | |
librsvg: Disable GTK+ 3 dependency
GTK+ 2 is still our default, so packages should generally not depend on GTK+ 3. For instance, this causes Emacs to depend on both GTK+ 2 and 3, which is obviously a bad thing. Issue #8990.
Diffstat (limited to 'pkgs/development/libraries/librsvg')
| -rw-r--r-- | pkgs/development/libraries/librsvg/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 4c22c988c79..ea1910733e7 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf +{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf , bzip2, libcroco, libintlOrEmpty -, gtk3 ? null +, withGTK ? false, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: # no introspection by default, it's too big @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; - propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk3 ]; + propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; nativeBuildInputs = [ pkgconfig ]; |