From ed204dc61bf393683c15286c312e4b0ec1ef770a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 28 Sep 2020 03:43:38 -0300 Subject: [PATCH] Netsurf libdom: 0.4.0 -> 0.4.1 --- .../networking/browsers/netsurf/default.nix | 1 + .../browsers/netsurf/libdom.nix} | 26 +++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) rename pkgs/applications/{misc/netsurf/libdom/default.nix => networking/browsers/netsurf/libdom.nix} (50%) diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix index 7aa18f514fb..0698642af00 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 { }; + libdom = callPackage ./libdom.nix { }; libhubbub = callPackage ./libhubbub.nix { }; libnsbmp = callPackage ./libnsbmp.nix { }; libnsgif = callPackage ./libnsgif.nix { }; diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/networking/browsers/netsurf/libdom.nix similarity index 50% rename from pkgs/applications/misc/netsurf/libdom/default.nix rename to pkgs/applications/networking/browsers/netsurf/libdom.nix index 8dde3e336cd..3aa9e3a1878 100644 --- a/pkgs/applications/misc/netsurf/libdom/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/libdom.nix @@ -6,23 +6,22 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libdom"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy"; + sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o="; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ expat - buildsystem + buildInputs = [ + expat + libhubbub libparserutils libwapcaplet - libhubbub - ]; + buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -30,10 +29,15 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Document Object Model library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + longDescription = '' + LibDOM is an implementation of the W3C DOM, written in C. It is currently + in development for use with NetSurf and is intended to be suitable for use + in other projects under a more permissive license. + ''; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; }