From 833160293ddf368f05df1ab27d36c7e36991cdc5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 22 Jul 2023 13:41:43 -0300 Subject: [PATCH] netsurf.libnslog: rewrite --- .../networking/browsers/netsurf/libnslog.nix | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/netsurf/libnslog.nix b/pkgs/applications/networking/browsers/netsurf/libnslog.nix index 7189f1c591b3..f9243ec56888 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnslog.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnslog.nix @@ -1,18 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, bison, flex +{ lib +, stdenv +, fetchurl +, bison +, flex +, pkg-config , buildsystem }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libnslog"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libnslog"; version = "0.1.3"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A="; + url = "http://download.netsurf-browser.org/libs/releases/libnslog-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A="; }; - nativeBuildInputs = [ pkg-config bison flex ]; + nativeBuildInputs = [ + bison + flex + pkg-config + ]; + buildInputs = [ buildsystem ]; makeFlags = [ @@ -20,11 +29,10 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { + meta = { homepage = "https://www.netsurf-browser.org/"; description = "NetSurf Parametric Logging Library"; - license = licenses.isc; - maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.isc; + inherit (buildsystem.meta) maintainers platforms; }; -} +})