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

Adding gtkhtml, another program needed for gnucash to build.

Browse Source 
I thought gtkhtml was not needed, and in my previous commit I removed it as a gnucash dependency.


svn path=/nixpkgs/trunk/; revision=19639
This commit is contained in:
Lluís Batlle i Rossell 2010-01-24 22:07:53 +00:00
parent 6f462d2c7c
commit 029cd0a213
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/office/gnucash/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk { 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 , gettext, intltool, perl, guile, slibGuile, swig, isocodes, bzip2
, makeWrapper }: , makeWrapper }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pkgconfig libxml2 gconf glib gtk 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 gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper
]; ];

7
pkgs/desktops/gnome-2.28/default.nix
View File

@ -142,6 +142,13 @@ rec {
# What name should we use?? # What name should we use??
gtkdoc = gtk_doc; 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 # Freedesktop library
startup_notification = import ./platform/startup-notification { startup_notification = import ./platform/startup-notification {
inherit (pkgs) stdenv fetchurl pkgconfig xlibs; inherit (pkgs) stdenv fetchurl pkgconfig xlibs;

13
pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix Normal file
View File

@ -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 ];
}

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

@ -6983,7 +6983,7 @@ let
gnucash = import ../applications/office/gnucash { gnucash = import ../applications/office/gnucash {
inherit fetchurl stdenv pkgconfig libxml2 goffice enchant inherit fetchurl stdenv pkgconfig libxml2 goffice enchant
gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper; 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; libgnomeprint;
gconf = gnome.GConf; gconf = gnome.GConf;
}; };