diff --git a/pkgs/development/libraries/scrollkeeper/builder.sh b/pkgs/development/libraries/scrollkeeper/builder.sh deleted file mode 100644 index f71ccb6e10e..00000000000 --- a/pkgs/development/libraries/scrollkeeper/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -. $stdenv/setup - -export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB - -configureFlags="--with-xml-catalog=$docbook_xml_dtd_42/xml/dtd/docbook/docbook.cat" - -genericBuild diff --git a/pkgs/development/libraries/scrollkeeper/default.nix b/pkgs/development/libraries/scrollkeeper/default.nix deleted file mode 100644 index 6ffd1d6c453..00000000000 --- a/pkgs/development/libraries/scrollkeeper/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, perl, libxml2, libxslt, docbook_xml_dtd_42 -, perlXMLParser}: - -assert perl != null && libxml2 != null && libxslt != null - && docbook_xml_dtd_42 != null && perlXMLParser != null; - -# !!! seems to need iconv, but cannot find it since $glibc/bin is not in PATH - -stdenv.mkDerivation { - name = "scrollkeeper-0.3.14"; - builder = ./builder.sh; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/scrollkeeper-0.3.14.tar.gz; - md5 = "161eb3f29e30e7b24f84eb93ac696155"; - }; - buildInputs = [perl libxml2 libxslt]; - inherit docbook_xml_dtd_42 perlXMLParser; -} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 60563f466c6..6766acd3fb9 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -606,11 +606,6 @@ rec { inherit fetchurl stdenv gettext; }; - scrollkeeper = (import ../development/libraries/scrollkeeper) { - inherit fetchurl stdenv perl libxml2 libxslt - docbook_xml_dtd_42 perlXMLParser; - }; - gtkLibs = gtkLibs26; gtkLibs26 = import ../development/libraries/gtk-libs-2.6 { @@ -640,7 +635,7 @@ rec { inherit fetchurl stdenv mono pkgconfig libxml2 monoDLLFixer; inherit (gnome) gtk glib pango libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui gconf; + libgnomeprintui gconf gnomepanel; }; gtksourceviewsharp = import ../development/libraries/gtksourceview-sharp { @@ -648,15 +643,21 @@ rec { inherit (gnome) gtksourceview; }; + geckosharp = import ../development/libraries/gecko-sharp { + inherit fetchurl stdenv mono pkgconfig gtksharp monoDLLFixer; + inherit (gnome) gtk; + }; + audiofile = (import ../development/libraries/audiofile) { inherit fetchurl stdenv; }; gnome = import ../development/libraries/gnome { inherit fetchurl stdenv pkgconfig audiofile - flex bison popt perl zlib libxml2 bzip2 - perlXMLParser gettext perl x11 + flex bison popt perl zlib libxml2 libxslt bzip2 + perlXMLParser docbook_xml_dtd_42 gettext perl x11 libtiff libjpeg libpng gtkLibs; + inherit (xlibs) libXmu; }; wxGTK = (import ../development/libraries/wxGTK-2.5) { @@ -1089,9 +1090,9 @@ rec { zapping = (import ../applications/video/zapping) { inherit fetchurl stdenv pkgconfig perl python - scrollkeeper gettext zvbi libjpeg libpng x11 + gettext zvbi libjpeg libpng x11 rte perlXMLParser; - inherit (gnome) libgnomeui libglade esound; + inherit (gnome) scrollkeeper libgnomeui libglade esound; inherit (xlibs) libXv libXmu libXext; teletextSupport = true; jpegSupport = true; @@ -1128,8 +1129,8 @@ rec { monodevelop = (import ../applications/editors/monodevelop) { inherit fetchurl stdenv mono gtksharp gtksourceviewsharp - perl perlXMLParser pkgconfig; - inherit (gnome) gnomevfs libbonobo gconf glib; + geckosharp monodoc perl perlXMLParser pkgconfig; + inherit (gnome) gnomevfs libbonobo libglade gconf glib gtk; }; monodoc = (import ../applications/editors/monodoc) {