diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 94c4a387007..213e3fd0a45 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk -, libglade, libgnomeui, libgtkhtml, libgnomeprint, goffice, enchant +, libglade, libgnomeui, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant , gettext, intltool, perl, guile, slibGuile, swig, isocodes, bzip2 , makeWrapper }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 gconf glib gtk - libglade libgnomeui libgtkhtml libgnomeprint goffice enchant + libglade libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper ]; diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 40cf09636d0..cfc1b157977 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -141,6 +141,13 @@ rec { # What name should we use?? gtkdoc = gtk_doc; + + gtkhtml = import ./platform/gtkhtml { + inherit (pkgs.gtkLibs) gtk; + inherit (pkgs) fetchurl stdenv pkgconfig intltool enchant isocodes; + inherit GConf gnome_icon_theme; + }; + # Freedesktop library startup_notification = import ./platform/startup-notification { diff --git a/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix new file mode 100644 index 00000000000..e4ced2247a5 --- /dev/null +++ b/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, pkgconfig, gtk, intltool, +GConf, enchant, isocodes, gnome_icon_theme }: + +stdenv.mkDerivation rec { + name = "gtkhtml-3.29.5"; + + src = fetchurl { + url = "mirror://gnome/sources/gtkhtml/3.29/${name}.tar.bz2"; + sha256 = "0abd91isqbriq9nclq14275v2xd0r9vrr3sxhxwxxp02m8gskwvd"; + }; + + buildInputs = [pkgconfig gtk intltool GConf enchant isocodes gnome_icon_theme ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8ea3ae4531..3573abe8516 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6983,7 +6983,7 @@ let gnucash = import ../applications/office/gnucash { inherit fetchurl stdenv pkgconfig libxml2 goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper; - inherit (gnome) gtk glib libglade libgnomeui libgtkhtml + inherit (gnome) gtk glib libglade libgnomeui libgtkhtml gtkhtml libgnomeprint; gconf = gnome.GConf; };