diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 213e3fd0a457..94c4a3870078 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, gtkhtml, libgnomeprint, goffice, enchant +, libglade, libgnomeui, libgtkhtml, 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 gtkhtml libgnomeprint goffice enchant + libglade libgnomeui libgtkhtml 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 dfc637551f85..40cf09636d08 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -11,8 +11,6 @@ rec { gnomeicontheme = gnome_icon_theme; # !!! Missing! Need to add these. - libgnomeprint = throw "libgnomeprint not implemented"; - libgtkhtml = throw "libgtkhtml not implemented"; vte = throw "vte not implemented"; gtksourceview_24 = gtksourceview; @@ -47,6 +45,23 @@ rec { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 python gettext; inherit (pkgs.gtkLibs) gtk; }; + + libgnomeprint = import ./platform/libgnomeprint { + inherit intltool libart_lgpl libgnomecups; + inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2 bison flex; + inherit (pkgs.gtkLibs) gtk; + }; + + libgnomecups = import ./platform/libgnomecups { + inherit intltool libart_lgpl; + inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2; + inherit (pkgs.gtkLibs) gtk; + }; + + libgtkhtml = import ./platform/libgtkhtml { + inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2; + inherit (pkgs.gtkLibs) gtk; + }; intltool = import ./platform/intltool { inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser gettext; diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix new file mode 100644 index 000000000000..ec276578cb64 --- /dev/null +++ b/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }: + +stdenv.mkDerivation { + name = "libgnomecups-0.2.3"; + + src = fetchurl { + url = mirror://gnome/sources/libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2; + sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71"; + }; + + buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ]; + propagatedBuildInputs = [ libxml2 ]; +} diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix new file mode 100644 index 000000000000..3fa902c67e6f --- /dev/null +++ b/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl, libgnomecups, bison, +flex }: + +stdenv.mkDerivation { + name = "libgnomeprint-2.11.1"; + + src = fetchurl { + url = mirror://gnome/sources/libgnomeprint/2.18/libgnomeprint-2.18.6.tar.bz2; + sha256 = "15c00ya2mx0x4mh8lyy3xg9dd66z5yjnax74bqx99zd90sar10fg"; + }; + + buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ]; + propagatedBuildInputs = [ libxml2 ]; +} diff --git a/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix new file mode 100644 index 000000000000..6aab400c60ae --- /dev/null +++ b/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2 }: + +stdenv.mkDerivation { + name = "libgtkhtml-2.11.1"; + + src = fetchurl { + url = mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2; + sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw"; + }; + + buildInputs = [ pkgconfig gtk gettext ]; + propagatedBuildInputs = [ libxml2 ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3573abe85162..b8ea3ae45312 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 gtkhtml + inherit (gnome) gtk glib libglade libgnomeui libgtkhtml libgnomeprint; gconf = gnome.GConf; };