git.iko.soy/typeable/nixpkgs
on master help sign in
Netsurf browser: 3.9 -> 3.10
commit30729522955f1d43edc6a4af4004b323e23435a6 authorAndersonTorres <torres.anderson.85@protonmail.com> dateMon 28 Sep 2020, 03:50 (6 years ago) parent66fac9a
2 files changed+21−26
pkgs/applications/misc/netsurf/browser/default.nix → pkgs/applications/networking/browsers/netsurf/browser.nix+19−26 pkgs/applications/networking/browsers/netsurf/default.nix+2
pkgs/applications/misc/netsurf/browser/default.nix → pkgs/applications/networking/browsers/netsurf/browser.nixrenamed+19−26
@@ -1,25 +1,21 @@
11{ stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook
22
33# Buildtime dependencies.
4−
54, check, pkgconfig, xxd
65
76# Runtime dependencies.
8−
97, curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2
108, openssl, perl, perlPackages
119
1210# uilib-specific dependencies
13−
1411, gtk2 # GTK 2
12+, gtk3 # GTK 3
1513, SDL # Framebuffer
1614
1715# Configuration
18−
19−, uilib ? "framebuffer"
16+, uilib
2017
2118# Netsurf-specific dependencies
22−
2319, libcss, libdom, libhubbub, libnsbmp, libnsfb, libnsgif
2420, libnslog, libnspsl, libnsutils, libparserutils, libsvgtiny, libutf8proc
2521, libwapcaplet, nsgenbind
@@ -29,24 +25,14 @@ let
2925 inherit (stdenv.lib) optional optionals;
3026in
3127stdenv.mkDerivation rec {
32−
3328 pname = "netsurf";
34− version = "3.9";
29+ version = "3.10";
3530
3631 src = fetchurl {
37− url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz";
38− sha256 = "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp";
32+ url = "http://download.netsurf-browser.org/netsurf/releases/source/${pname}-${version}-src.tar.gz";
33+ sha256 = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4=";
3934 };
4035
41− patches = [
42− # GTK: prefer using curl's intrinsic defaults for CURLOPT_CA*
43− (fetchpatch {
44− name = "0001-GTK-prefer-using-curl-s-intrinsic-defaults-for-CURLO.patch";
45− url = "http://source.netsurf-browser.org/netsurf.git/patch/?id=87177d8aa109206d131e0d80a2080ce55dab01c7";
46− sha256 = "08bc60pc5k5qpckqv21zgmgszj3rpwskfc84shs8vg92vkimv2ai";
47− })
48− ];
49−
5036 nativeBuildInputs = [
5137 makeWrapper
5238 perl
@@ -54,10 +40,10 @@ stdenv.mkDerivation rec {
5440 pkgconfig
5541 xxd
5642 ]
57− ++ optional (uilib == "gtk") wrapGAppsHook
43+ ++ optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook
5844 ;
5945
60− buildInputs = [
46+ buildInputs = [
6147 check curl libXcursor libXrandr libidn libjpeg libpng libwebp libxml2 openssl
6248 # Netsurf-specific libraries
6349 nsgenbind libnsfb libwapcaplet libparserutils libnslog libcss
@@ -65,7 +51,8 @@ stdenv.mkDerivation rec {
6551 libutf8proc
6652 ]
6753 ++ optionals (uilib == "framebuffer") [ expat SDL ]
68− ++ optional (uilib == "gtk") gtk2
54+ ++ optional (uilib == "gtk2") gtk2
55+ ++ optional (uilib == "gtk3") gtk3
6956 ;
7057
7158 preConfigure = ''
@@ -81,10 +68,16 @@ stdenv.mkDerivation rec {
8168 ];
8269
8370 meta = with stdenv.lib; {
84− homepage = "http://www.netsurf-browser.org/";
85− description = "Free opensource web browser";
86− license = licenses.gpl2;
87− maintainers = [ maintainers.vrthra ];
71+ homepage = "https://www.netsurf-browser.org/";
72+ description = "A free, open source, small web browser";
73+ longDescription = ''
74+ NetSurf is a free, open source web browser. It is written in C and
75+ released under the GNU Public Licence version 2. NetSurf has its own
76+ layout and rendering engine entirely written from scratch. It is small and
77+ capable of handling many of the web standards in use today.
78+ '';
79+ license = licenses.gpl2Only;
80+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
8881 platforms = platforms.linux;
8982 };
9083}
pkgs/applications/networking/browsers/netsurf/default.nix+2
@@ -16,6 +16,8 @@ lib.makeScope pkgs.newScope (self: with self; {
1616 else if ui == "framebuffer" then pkgs.SDL
1717 else null;
1818
19+ browser = callPackage ./browser.nix { };
20+
1921 buildsystem = callPackage ./buildsystem.nix { };
2022 libcss = callPackage ./libcss.nix { };
2123 libdom = callPackage ./libdom.nix { };