From 122e4d2668bd7b4b6ee57ee47b2c884c7f76eb81 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 22 Jul 2023 12:31:05 -0300 Subject: [PATCH] netsurf.libdom: rewrite --- .../networking/browsers/netsurf/libdom.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/netsurf/libdom.nix b/pkgs/applications/networking/browsers/netsurf/libdom.nix index 4c7224f2263c..328bed30f17d 100644 --- a/pkgs/applications/networking/browsers/netsurf/libdom.nix +++ b/pkgs/applications/networking/browsers/netsurf/libdom.nix @@ -1,43 +1,47 @@ -{ lib, stdenv, fetchurl, pkg-config, expat +{ lib +, stdenv +, fetchurl +, expat +, pkg-config , buildsystem , libparserutils , libwapcaplet , libhubbub }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libdom"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-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="; + url = "http://download.netsurf-browser.org/libs/releases/libdom-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ expat + buildsystem libhubbub libparserutils libwapcaplet - buildsystem ]; + ]; makeFlags = [ "PREFIX=$(out)" "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + meta = { + homepage = "https://www.netsurf-browser.org/projects/libdom/"; 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; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +})