diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix deleted file mode 100644 index 7cfd0a935f3..00000000000 --- a/pkgs/applications/misc/netsurf/libhubbub/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, perl -, buildsystem -, libparserutils -}: - -stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; - libname = "libhubbub"; - version = "0.3.6"; - - src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1x3v7xvagx85v9h3pypzc86rcxs4mij87mmcqkp8pq50q6awfmnp"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl - buildsystem - libparserutils - ]; - - makeFlags = [ - "PREFIX=$(out)" - "NSSHARED=${buildsystem}/share/netsurf-buildsystem" - ]; - - meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; - description = "HTML5 parser library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix index 25ef6c048ee..7aa18f514fb 100644 --- a/pkgs/applications/networking/browsers/netsurf/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/default.nix @@ -3,6 +3,7 @@ lib.makeScope pkgs.newScope (self: with self; { buildsystem = callPackage ./buildsystem.nix { }; libcss = callPackage ./libcss.nix { }; + libhubbub = callPackage ./libhubbub.nix { }; libnsbmp = callPackage ./libnsbmp.nix { }; libnsgif = callPackage ./libnsgif.nix { }; libnslog = callPackage ./libnslog.nix { }; diff --git a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix new file mode 100644 index 00000000000..53b8d270d4f --- /dev/null +++ b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, pkgconfig, perl +, buildsystem +, libparserutils +}: + +stdenv.mkDerivation rec { + pname = "netsurf-${libname}"; + libname = "libhubbub"; + version = "0.3.7"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY="; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + perl + libparserutils + buildsystem ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "https://www.netsurf-browser.org/projects/hubbub/"; + description = "HTML5 parser library for netsurf browser"; + longDescription = '' + Hubbub is an HTML5 compliant parsing library, written in C. It was + developed as part of the NetSurf project and is available for use by other + software under the MIT licence. + + The HTML5 specification defines a parsing algorithm, based on the + behaviour of mainstream browsers, which provides instructions for how to + parse all markup, both valid and invalid. As a result, Hubbub parses web + content well. + ''; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +}