From be755b5c622ac22335754acb7aa00d7b98529519 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 26 Aug 2023 09:54:22 -0300 Subject: [PATCH] libpkgconf: refactor - Use rec-less, overlay-style overridable recursive attributes (in effect since https://github.com/NixOS/nixpkgs/pull/119942) - Include meta.changelog and meta.mainProgram --- pkgs/development/tools/misc/pkgconf/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index a3acb20bb56..d5afea351ff 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -4,12 +4,12 @@ , removeReferencesTo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pkgconf"; version = "2.0.2"; src = fetchurl { - url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; + url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-${finalAttrs.version}.tar.xz"; hash = "sha256-6lol748lHrU3fsDiHHX7YYlEM8+9vwslWboz5MJmRAE="; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { mv ${placeholder "dev"}/share ${placeholder "out"} ''; - meta = with lib; { + meta = { homepage = "https://github.com/pkgconf/pkgconf"; description = "Package compiler and linker metadata toolkit"; longDescription = '' @@ -52,8 +52,10 @@ stdenv.mkDerivation rec { functionality, to allow other tooling such as compilers and IDEs to discover and use libraries configured by pkgconf. ''; - license = licenses.isc; - maintainers = with maintainers; [ zaninime AndersonTorres ]; - platforms = platforms.all; + changelog = "https://github.com/pkgconf/pkgconf/blob/pkgconf-${finalAttrs.version}/NEWS"; + license = lib.licenses.isc; + mainProgram = "pkgconf"; + maintainers = with lib.maintainers; [ zaninime AndersonTorres ]; + platforms = lib.platforms.all; }; -} +})