diff options
| -rw-r--r-- | pkgs/applications/networking/browsers/netsurf/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/netsurf/libcss.nix (renamed from pkgs/applications/misc/netsurf/libcss/default.nix) | 29 |
2 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix index 7c5b98a7ea6..25ef6c048ee 100644 --- a/pkgs/applications/networking/browsers/netsurf/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/default.nix @@ -2,6 +2,7 @@ lib.makeScope pkgs.newScope (self: with self; { buildsystem = callPackage ./buildsystem.nix { }; + libcss = callPackage ./libcss.nix { }; libnsbmp = callPackage ./libnsbmp.nix { }; libnsgif = callPackage ./libnsgif.nix { }; libnslog = callPackage ./libnslog.nix { }; diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/networking/browsers/netsurf/libcss.nix index 528b0d9b958..db907edd879 100644 --- a/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/libcss.nix @@ -1,26 +1,25 @@ { stdenv, fetchurl, pkgconfig, perl , buildsystem -, libwapcaplet , libparserutils +, libwapcaplet }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libcss"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1vw9j3d2mr4wbvs8fyqmgslkbxknvac10456775hflxxcivbm3xr"; + sha256 = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw="; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl - buildsystem - libwapcaplet + buildInputs = [ + perl libparserutils - ]; + libwapcaplet + buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -30,10 +29,16 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough"; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Cascading Style Sheets library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + longDescription = '' + LibCSS is a CSS parser and selection engine. It aims to parse the forward + compatible CSS grammar. It was developed as part of the NetSurf project + and is available for use by other software, under a more permissive + license. + ''; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; } |