From 8dde79a795753dcefb90f5050dc79a5649ef22fc Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:19:16 -0700
Subject: [PATCH 01/13] netsurf-buildsystem: init at 1.5

---
 .../misc/netsurf/buildsystem/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/buildsystem/default.nix

diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
new file mode 100644
index 00000000000..f64fbe8528b
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-buildsystem-${version}";
+  version = "1.5";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz";
+    sha256 = "0wdgvasrjik1dgvvpqbppbpyfzkqd1v45x3g9rq7p67n773azinv";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.netsurf-browser.org/";
+    description = "Build system for netsurf browser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce95ff39f64..b177555f8c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2218,6 +2218,12 @@ in
 
   netdata = callPackage ../tools/system/netdata { };
 
+  netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec {
+
+    buildsystem = callPackage ../applications/misc/netsurf/buildsystem { };
+
+  });
+
   netperf = callPackage ../applications/networking/netperf { };
 
   netsniff-ng = callPackage ../tools/networking/netsniff-ng { };

From 5aa722a436da390a5e106524b078bbff29d031a2 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:26:14 -0700
Subject: [PATCH 02/13] netsurf-libwapcaplet: init at 0.3.0

---
 .../misc/netsurf/libwapcaplet/default.nix     | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libwapcaplet/default.nix

diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
new file mode 100644
index 00000000000..edcc45ca0fa
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libwapcaplet";
+  version = "0.3.0";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "0cs1dd2afjgc3wf5gqg434hv6jdabrp9qvlpl4dp53nhkyfywna3";
+  };
+
+  buildInputs = [ buildsystem ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.netsurf-browser.org/";
+    description = "String internment library for netsurf browser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b177555f8c7..b4d34bb2bd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2222,6 +2222,8 @@ in
 
     buildsystem = callPackage ../applications/misc/netsurf/buildsystem { };
 
+    libwapcaplet = callPackage ../applications/misc/netsurf/libwapcaplet { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };

From 47675a68d3ed9a192d17daf9ea3088c8e1add69c Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:27:33 -0700
Subject: [PATCH 03/13] netsurf-nsgenbind: init at 0.3

---
 .../misc/netsurf/nsgenbind/default.nix        | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/nsgenbind/default.nix

diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
new file mode 100644
index 00000000000..0985a182520
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl
+, flex, bison
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-nsgenbind-${version}";
+  version = "0.3";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${version}-src.tar.gz";
+    sha256 = "16xsazly7gxwywmlkf2xix9b924sj3skhgdak7218l0nc62a08gg";
+  };
+
+  buildInputs = [ buildsystem flex bison ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.netsurf-browser.org/";
+    description = "Generator for JavaScript bindings for netsurf browser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4d34bb2bd4..e7df71eeee4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2224,6 +2224,8 @@ in
 
     libwapcaplet = callPackage ../applications/misc/netsurf/libwapcaplet { };
 
+    nsgenbind = callPackage ../applications/misc/netsurf/nsgenbind { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };

From f5fec0410c572ecd6d23d8968f660fac5687322b Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:28:40 -0700
Subject: [PATCH 04/13] netsurf-libparserutils: init at 0.2.3

---
 .../misc/netsurf/libparserutils/default.nix   | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libparserutils/default.nix

diff --git a/pkgs/applications/misc/netsurf/libparserutils/default.nix b/pkgs/applications/misc/netsurf/libparserutils/default.nix
new file mode 100644
index 00000000000..275c2cccaef
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libparserutils/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, perl
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libparserutils";
+  version = "0.2.3";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "01gzlsabgl6x0icd8758d9jqs8rrf9574bdkjainn04w3fs3znf5";
+  };
+
+  buildInputs = [ buildsystem perl ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.netsurf-browser.org/";
+    description = "Parser building library for netsurf browser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7df71eeee4..5452b82f8ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2226,6 +2226,8 @@ in
 
     nsgenbind = callPackage ../applications/misc/netsurf/nsgenbind { };
 
+    libparserutils = callPackage ../applications/misc/netsurf/libparserutils { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };

From 1329375b253be2e9996b23355ce3a54294b7740d Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:29:59 -0700
Subject: [PATCH 05/13] netsurf-libcss: init at 0.6.0

---
 .../misc/netsurf/libcss/default.nix           | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libcss/default.nix

diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix
new file mode 100644
index 00000000000..9db681bf5c1
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libcss/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, perl
+, buildsystem
+, libwapcaplet
+, libparserutils
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libcss";
+  version = "0.6.0";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "0qp4p1q1dwgdra4pkrzd081zjzisxkgwx650ijx323j8bj725daf";
+  };
+
+  buildInputs = [ pkgconfig perl
+    buildsystem
+    libwapcaplet
+    libparserutils
+  ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.netsurf-browser.org/";
+    description = "Cascading Style Sheets library for netsurf browser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5452b82f8ba..34425885775 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2228,6 +2228,8 @@ in
 
     libparserutils = callPackage ../applications/misc/netsurf/libparserutils { };
 
+    libcss = callPackage ../applications/misc/netsurf/libcss { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };

From e3c35ae619555f39441bd617f477a8d62d8c83c2 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:31:00 -0700
Subject: [PATCH 06/13] netsurf-libhubbub: init at 0.3.3

---
 .../misc/netsurf/libhubbub/default.nix        | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libhubbub/default.nix

diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix
new file mode 100644
index 00000000000..ef319e95089
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libhubbub/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, perl
+, buildsystem
+, libparserutils
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libhubbub";
+  version = "0.3.3";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "101781iw32p47386fxqr01nrkywi12w17ajh02k2vlga4z8zyv86";
+  };
+
+  buildInputs = [ pkgconfig 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34425885775..e7679b7b824 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2230,6 +2230,8 @@ in
 
     libcss = callPackage ../applications/misc/netsurf/libcss { };
 
+    libhubbub = callPackage ../applications/misc/netsurf/libhubbub { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };

From d716b0f68dee2cae13013b9d0e9c94917560a7cd Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:32:06 -0700
Subject: [PATCH 07/13] netsurf-libdom: init at 0.3.0

---
 .../misc/netsurf/libdom/default.nix           | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libdom/default.nix

diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix
new file mode 100644
index 00000000000..9287ee9a084
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libdom/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, expat
+, buildsystem
+, libparserutils
+, libwapcaplet
+, libhubbub
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libdom";
+  version = "0.3.0";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "1kk6qbqagx5ypiy9kf0059iqdzyz8fqaw336vzhb5gnrzjw3wv4a";
+  };
+
+  buildInputs = [ pkgconfig 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7679b7b824..7cfeaaf5dc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2232,6 +2232,8 @@ in
 
     libhubbub = callPackage ../applications/misc/netsurf/libhubbub { };
 
+    libdom = callPackage ../applications/misc/netsurf/libdom { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };

From ec87aa51a630254edb5eed4afae388740476e111 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:33:08 -0700
Subject: [PATCH 08/13] netsurf-libnsbmp: init at 0.1.3

---
 .../misc/netsurf/libnsbmp/default.nix         | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libnsbmp/default.nix

diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix
new file mode 100644
index 00000000000..44f644e162b
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libnsbmp";
+  version = "0.1.3";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "0gmvzw1whh7553d6s98vr4ri2whjwrgggcq1z5b160gwjw20mzyy";
+  };
+
+  buildInputs = [ pkgconfig
+    buildsystem
+  ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.netsurf-browser.org/";
+    description = "BMP Decoder for netsurf browser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cfeaaf5dc1..e93241814f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2234,6 +2234,8 @@ in
 
     libdom = callPackage ../applications/misc/netsurf/libdom { };
 
+    libnsbmp = callPackage ../applications/misc/netsurf/libnsbmp { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };

From b02f57204d48ddd045fb6f08acd153a8f73de884 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:34:15 -0700
Subject: [PATCH 09/13] netsurf-libnsgif: init at 0.1.3

---
 .../misc/netsurf/libnsgif/default.nix         | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libnsgif/default.nix

diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/misc/netsurf/libnsgif/default.nix
new file mode 100644
index 00000000000..09ec6c6ecc3
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libnsgif/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libnsgif";
+  version = "0.1.3";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "1a4z45gh0fw4iybf34fig725av25h31ffk0azi0snzh4130cklnk";
+  };
+
+  buildInputs = [ buildsystem pkgconfig];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.netsurf-browser.org/";
+    description = "GIF Decoder for netsurf browser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e93241814f8..3c298b1caf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2236,6 +2236,8 @@ in
 
     libnsbmp = callPackage ../applications/misc/netsurf/libnsbmp { };
 
+    libnsgif = callPackage ../applications/misc/netsurf/libnsgif { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };

From df6540dc55981a52d2b0814900131640bf91b25d Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:35:16 -0700
Subject: [PATCH 10/13] netsurf-libnsfb: init at 0.1.4

---
 .../misc/netsurf/libnsfb/default.nix          | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libnsfb/default.nix

diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix
new file mode 100644
index 00000000000..3e2346597fa
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libnsfb/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, ui? "gtk"
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libnsfb";
+  version = "0.1.4";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "176f8why9gzbaca9nnxjqasl02qzc6g507z5w3dzkcjifnkz4mzl";
+  };
+
+  buildInputs = [ pkgconfig buildsystem ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "TARGET=${ui}"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.netsurf-browser.org/";
+    description = "CSS parser and selection library for netsurf browser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c298b1caf9..1f2428e6d3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2238,6 +2238,8 @@ in
 
     libnsgif = callPackage ../applications/misc/netsurf/libnsgif { };
 
+    libnsfb = callPackage ../applications/misc/netsurf/libnsfb { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };

From 4393be74de8762f1aecafa7f17c1f711fb605f0b Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:36:19 -0700
Subject: [PATCH 11/13] netsurf-libnsutils: init at 0.0.2

---
 .../misc/netsurf/libnsutils/default.nix       | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libnsutils/default.nix

diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/misc/netsurf/libnsutils/default.nix
new file mode 100644
index 00000000000..9d931d6bea2
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libnsutils/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libnsutils";
+  version = "0.0.2";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "03p4xmd08yhj70nyj7acjccmmshs59lv4n4zsqpsn5lgkwa23lzy";
+  };
+
+  buildInputs = [ buildsystem pkgconfig];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.netsurf-browser.org/";
+    description = "Generalised utility library for netsurf browser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f2428e6d3d..98ab8399c8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2240,6 +2240,8 @@ in
 
     libnsfb = callPackage ../applications/misc/netsurf/libnsfb { };
 
+    libnsutils = callPackage ../applications/misc/netsurf/libnsutils { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };

From 9e7434348dbfe93cc7a6acd5235b1b101b60fff4 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:37:37 -0700
Subject: [PATCH 12/13] netsurf-libutf8proc: init at 1.3.1

---
 .../misc/netsurf/libutf8proc/default.nix      | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libutf8proc/default.nix

diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/misc/netsurf/libutf8proc/default.nix
new file mode 100644
index 00000000000..b2057e1889f
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libutf8proc/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libutf8proc";
+  version = "1.3.1";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "0xf659y3c6ikjnip47r30wv796a34d71p6qhc4xjs64iqszm1sbq";
+  };
+
+  buildInputs = [ buildsystem pkgconfig];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.netsurf-browser.org/";
+    description = "UTF8 Processing library for netsurf browser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98ab8399c8e..42ade0f91ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2242,6 +2242,8 @@ in
 
     libnsutils = callPackage ../applications/misc/netsurf/libnsutils { };
 
+    libutf8proc = callPackage ../applications/misc/netsurf/libutf8proc { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };

From 02515e88f644fdd56b7a08253ae2ff9cbc1de3c9 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 21 Jun 2016 22:38:36 -0700
Subject: [PATCH 13/13] netsurf: init at 3.5

---
 .../misc/netsurf/browser/default.nix          | 78 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 80 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/browser/default.nix

diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
new file mode 100644
index 00000000000..2b9b254f20b
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -0,0 +1,78 @@
+{ stdenv, fetchurl, pkgconfig, libpng, openssl, curl, gtk2, check
+, libxml2, libidn, perl, nettools, perlPackages
+, libXcursor, libXrandr, makeWrapper
+, buildsystem
+, nsgenbind
+, libnsfb
+, libwapcaplet
+, libparserutils
+, libcss
+, libhubbub
+, libdom
+, libnsbmp
+, libnsgif
+, libnsutils
+, libutf8proc
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${version}";
+  version = "3.5";
+
+  # UIS incldue Framebuffer, and gtk, but
+  # Framebuffer is buggy. To enable, make sure
+  # to also build netsurf-libnsfb with ui=framebuffer
+  # and switch the ui here to framebuffer
+  ui = "gtk";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz";
+    sha256 = "1k0x8mzgavfy7q9kywl6kzsc084g1xlymcnsxi5v6jp279nsdwwq";
+  };
+
+  buildInputs = [ pkgconfig libpng openssl curl gtk2 check libxml2 libidn perl
+    nettools perlPackages.HTMLParser libXcursor libXrandr makeWrapper
+    buildsystem
+    nsgenbind
+    libnsfb
+    libwapcaplet
+    libparserutils
+    libcss
+    libhubbub
+    libdom
+    libnsbmp
+    libnsgif
+    libnsutils
+    libutf8proc
+ ];
+
+  preConfigure = ''
+    cat <<EOF > Makefile.conf
+    override NETSURF_GTK_RESOURCES := $out/share/Netsurf/${ui}/res
+    override NETSURF_USE_GRESOURCE := YES
+    EOF
+  '';
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "TARGET=${ui}"
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/Netsurf/${ui}
+    cmd=$(case "${ui}" in framebuffer) echo nsfb;; gtk) echo nsgtk;; esac)
+    cp $cmd $out/bin/netsurf
+    wrapProgram $out/bin/netsurf --set NETSURFRES $out/share/Netsurf/${ui}/res
+    tar -hcf - ${ui}/res | (cd $out/share/Netsurf/ && tar -xvpf -)
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.netsurf-browser.org/";
+    description = "Free opensource web browser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42ade0f91ac..5178c9e2b36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2244,6 +2244,8 @@ in
 
     libutf8proc = callPackage ../applications/misc/netsurf/libutf8proc { };
 
+    browser = callPackage ../applications/misc/netsurf/browser { };
+
   });
 
   netperf = callPackage ../applications/networking/netperf { };