Skip to content

Commit

Permalink
librsvg: Disable GTK+ 3 dependency
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@edolstra
edolstra committed Jul 26, 2015
1 parent 761fc1a commit d7e97e0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/development/libraries/librsvg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 ];

Expand Down

5 comments on commit d7e97e0

@vcunat
Copy link
Member

@vcunat vcunat commented on d7e97e0 Jul 26, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As it is, this commit will likely break gnome3 stuff. /cc @lethalman.

@lucabrunox
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcunat why does librsvg need gtk3? Reading the code now...

@lucabrunox
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw this change is going to rebuild all the webkits and gtk stuff, quite a heavy rebuild... not in number but expensive in my opinion to go to master. When I do these kind of changes I always go through staging first.

@lucabrunox
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gtk3 is only used for building rsvg-view-3... fine to drop it 👍 and anyway shouldn't be a propagated build input.

@vcunat
Copy link
Member

@vcunat vcunat commented on d7e97e0 Jul 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I see, thanks. I confused this with memory of something else that needed both gtk2 and gtk3.

Please sign in to comment.