From ed204dc61bf393683c15286c312e4b0ec1ef770a Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:43:38 -0300
Subject: Netsurf libdom: 0.4.0 -> 0.4.1

---
 pkgs/applications/misc/netsurf/libdom/default.nix  | 39 --------------------
 .../networking/browsers/netsurf/default.nix        |  1 +
 .../networking/browsers/netsurf/libdom.nix         | 43 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/applications/misc/netsurf/libdom/default.nix
 create mode 100644 pkgs/applications/networking/browsers/netsurf/libdom.nix

diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix
deleted file mode 100644
index 8dde3e336cdb2..0000000000000
--- a/pkgs/applications/misc/netsurf/libdom/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, expat
-, buildsystem
-, libparserutils
-, libwapcaplet
-, libhubbub
-}:
-
-stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
-  libname = "libdom";
-  version = "0.4.0";
-
-  src = fetchurl {
-    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ expat
-    buildsystem
-    libparserutils
-    libwapcaplet
-    libhubbub
-  ];
-
-  makeFlags = [
-    "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
-    description = "Document Object Model 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 7aa18f514fb18..0698642af00d4 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/networking/browsers/netsurf/libdom.nix b/pkgs/applications/networking/browsers/netsurf/libdom.nix
new file mode 100644
index 0000000000000..3aa9e3a1878e4
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/libdom.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, pkgconfig, expat
+, buildsystem
+, libparserutils
+, libwapcaplet
+, libhubbub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "netsurf-${libname}";
+  libname = "libdom";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o=";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    expat
+    libhubbub
+    libparserutils
+    libwapcaplet
+    buildsystem ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.netsurf-browser.org/projects/${libname}/";
+    description = "Document Object Model library for netsurf browser";
+    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;
+  };
+}
-- 
cgit 1.4.1