diff --git a/pkgs/development/libraries/gnome/default.nix b/pkgs/development/libraries/gnome/default.nix index 87b78f568624..3ca1380023da 100644 --- a/pkgs/development/libraries/gnome/default.nix +++ b/pkgs/development/libraries/gnome/default.nix @@ -1,9 +1,9 @@ # todo audiofile is also part of the gnome platform. Move it to this collection? { stdenv, fetchurl, pkgconfig, audiofile -, flex, bison, popt, perl, zlib, libxml2, bzip2 -, perlXMLParser, gettext, x11, libtiff, libjpeg -, libpng, gtkLibs +, flex, bison, popt, perl, zlib, libxml2, libxslt, bzip2 +, perlXMLParser, docbook_xml_dtd_42, gettext, x11, libtiff, libjpeg +, libpng, gtkLibs, libXmu }: rec { @@ -115,6 +115,12 @@ rec { input = platform.libgnomeui; }; + intltool = (import ./intltool) { + inherit fetchurl stdenv pkgconfig perl perlXMLParser; + input = platform.intltool; + }; + + # Desktop desktop = (import ./src-gnome-desktop-2.8.3.nix) { @@ -148,4 +154,29 @@ rec { gconf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */; input = desktop.gtksourceview; }; + + scrollkeeper = (import ./scrollkeeper) { + inherit fetchurl stdenv pkgconfig perl perlXMLParser + libxml2 libxslt docbook_xml_dtd_42; + input = desktop.scrollkeeper; + }; + + gnomedesktop = (import ./gnome-desktop) { + inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk + libgnomeui scrollkeeper libjpeg; + input = desktop.gnomedesktop; + }; + + libwnck = (import ./libwnck) { + inherit fetchurl stdenv pkgconfig gtk; + input = desktop.libwnck; + }; + + gnomepanel = (import ./gnome-panel) { + inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk ORBit2 + libgnome libgnomeui gnomedesktop libglade libwnck + libjpeg libpng scrollkeeper libXmu; + input = desktop.gnomepanel; + }; + } \ No newline at end of file diff --git a/pkgs/development/libraries/gnome/gnome-desktop/default.nix b/pkgs/development/libraries/gnome/gnome-desktop/default.nix new file mode 100644 index 000000000000..36df72311b2e --- /dev/null +++ b/pkgs/development/libraries/gnome/gnome-desktop/default.nix @@ -0,0 +1,9 @@ +{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk +, libgnomeui, scrollkeeper, libjpeg +}: + +stdenv.mkDerivation { + inherit (input) name src; + buildInputs = [pkgconfig perl gtk glib libgnomeui scrollkeeper libjpeg]; + PERL5LIB = perlXMLParser ~ "/lib/site_perl"; # !!! +} diff --git a/pkgs/development/libraries/gnome/gnome-panel/default.nix b/pkgs/development/libraries/gnome/gnome-panel/default.nix new file mode 100644 index 000000000000..bb7cf5422750 --- /dev/null +++ b/pkgs/development/libraries/gnome/gnome-panel/default.nix @@ -0,0 +1,14 @@ +{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk +, ORBit2, libgnome, libgnomeui, gnomedesktop, libglade, libwnck +, libjpeg, libpng, scrollkeeper, libXmu +}: + +stdenv.mkDerivation { + inherit (input) name src; + buildInputs = [ + pkgconfig perl gtk glib ORBit2 libgnome libgnomeui + gnomedesktop libglade libwnck libjpeg libpng scrollkeeper + libXmu + ]; + PERL5LIB = perlXMLParser ~ "/lib/site_perl"; # !!! +} diff --git a/pkgs/development/libraries/gnome/intltool/default.nix b/pkgs/development/libraries/gnome/intltool/default.nix new file mode 100644 index 000000000000..c7be6593c07f --- /dev/null +++ b/pkgs/development/libraries/gnome/intltool/default.nix @@ -0,0 +1,7 @@ +{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser}: + +stdenv.mkDerivation { + inherit (input) name src; + buildInputs = [pkgconfig perl perlXMLParser]; + PERL5LIB = perlXMLParser ~ "/lib/site_perl"; +} diff --git a/pkgs/development/libraries/gnome/libwnck/default.nix b/pkgs/development/libraries/gnome/libwnck/default.nix new file mode 100644 index 000000000000..9615348def4c --- /dev/null +++ b/pkgs/development/libraries/gnome/libwnck/default.nix @@ -0,0 +1,7 @@ +{input, stdenv, fetchurl, pkgconfig, gtk}: + +stdenv.mkDerivation { + inherit (input) name src; + buildInputs = [pkgconfig gtk]; +# PERL5LIB = perlXMLParser ~ "/lib/site_perl"; # !!! +} diff --git a/pkgs/development/libraries/gnome/scrollkeeper/builder.sh b/pkgs/development/libraries/gnome/scrollkeeper/builder.sh new file mode 100644 index 000000000000..c2c8fb9fe316 --- /dev/null +++ b/pkgs/development/libraries/gnome/scrollkeeper/builder.sh @@ -0,0 +1,5 @@ +. $stdenv/setup + +configureFlags="--with-xml-catalog=$docbook_xml_dtd_42/xml/dtd/docbook/docbook.cat" + +genericBuild diff --git a/pkgs/development/libraries/gnome/scrollkeeper/default.nix b/pkgs/development/libraries/gnome/scrollkeeper/default.nix new file mode 100644 index 000000000000..1efd056b8b36 --- /dev/null +++ b/pkgs/development/libraries/gnome/scrollkeeper/default.nix @@ -0,0 +1,12 @@ +{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser +, libxml2, libxslt, docbook_xml_dtd_42 +}: + +stdenv.mkDerivation { + inherit (input) name src; + patches = [./xmlcatalog.patch]; + buildInputs = [pkgconfig perl libxml2 libxslt]; + PERL5LIB = perlXMLParser ~ "/lib/site_perl"; # !!! + inherit docbook_xml_dtd_42; + builder = ./builder.sh; +} diff --git a/pkgs/development/libraries/gnome/scrollkeeper/xmlcatalog.patch b/pkgs/development/libraries/gnome/scrollkeeper/xmlcatalog.patch new file mode 100644 index 000000000000..77313819fceb --- /dev/null +++ b/pkgs/development/libraries/gnome/scrollkeeper/xmlcatalog.patch @@ -0,0 +1,37 @@ +diff -rrc scrollkeeper-orig/extract/dtds/Makefile.in scrollkeeper-0.3.14/extract/dtds/Makefile.in +*** scrollkeeper-orig/extract/dtds/Makefile.in 2003-12-06 09:18:01.000000000 +0100 +--- scrollkeeper-0.3.14/extract/dtds/Makefile.in 2005-03-08 19:22:27.000000000 +0100 +*************** +*** 408,414 **** + + # ScrollKeeper OMF Variation DTD V1.0 + install-data-hook: +! -/usr/bin/xmlcatalog --noout --add "public" \ + "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \ + "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG) + +--- 408,414 ---- + + # ScrollKeeper OMF Variation DTD V1.0 + install-data-hook: +! -xmlcatalog --noout --add "public" \ + "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \ + "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG) + +*************** +*** 418,424 **** + + # ScrollKeeper OMF Variation DTD V1.0 + uninstall-local: +! -/usr/bin/xmlcatalog --noout --del \ + "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +--- 418,424 ---- + + # ScrollKeeper OMF Variation DTD V1.0 + uninstall-local: +! -xmlcatalog --noout --del \ + "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix b/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix index b0ada94d4b98..d31054681d85 100644 --- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix +++ b/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix @@ -39,4 +39,37 @@ md5 = "2e59c8748594181d4bf452320c8c3b5c"; }; }; + + scrollkeeper = { + name = "scrollkeeper-0.3.14"; + src = fetchurl { + url = http://catamaran.labs.cs.uu.nl/dist/tarballs/scrollkeeper-0.3.14.tar.gz; + md5 = "161eb3f29e30e7b24f84eb93ac696155"; + }; + }; + + gnomedesktop = { + name = "gnome-desktop-2.8.3"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.8/2.8.3/sources/gnome-desktop-2.8.3.tar.bz2; + md5 = "607f8689f931336ad9a1f3f41d98a9c7"; + }; + }; + + libwnck = { + name = "libwnck-2.8.1"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.8/2.8.3/sources/libwnck-2.8.1.tar.bz2; + md5 = "c0a5a8478064287e167c15e3ec0e82a1"; + }; + }; + + gnomepanel = { + name = "gnome-panel-2.8.3"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/desktop/2.8/2.8.3/sources/gnome-panel-2.8.3.tar.bz2; + md5 = "d76a09c321e02c18e0fdecb86677550d"; + }; + }; + } \ No newline at end of file diff --git a/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix b/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix index 3332fb1b9e7c..90c112ada2ee 100644 --- a/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix +++ b/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix @@ -168,4 +168,13 @@ md5 = "6c732bbc5fba5a0f1f8086e8aa4f490d"; }; }; + + intltool = { + name = "intltool-0.33"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/platform/2.8/2.8.3/sources/intltool-0.33.tar.bz2; + md5 = "7d3b6d421b0fb9beee7faf97daab45e6"; + }; + }; + } \ No newline at end of file