From 2174f07ecc60f5b7810a5943ccb9892f74459519 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 14:51:20 +0000 Subject: [PATCH] annapurna-sil: use finalAttrs, update URL/doc paths, fully qualify lib attrs in meta Switch to finalAttrs form, reference finalAttrs.version in URL and doc install path, and replace broad `with lib;` with explicit lib-qualified attributes. --- pkgs/by-name/an/annapurna-sil/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/annapurna-sil/package.nix b/pkgs/by-name/an/annapurna-sil/package.nix index d30aaa2ab603..d8fbe0f5247a 100644 --- a/pkgs/by-name/an/annapurna-sil/package.nix +++ b/pkgs/by-name/an/annapurna-sil/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "annapurna-sil"; version = "2.100"; src = fetchzip { - url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${version}.zip"; + url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${finalAttrs.version}.zip"; hash = "sha256-TFaCchtd9SRGsU9r+m8QOvZfc7/FJxwclkSfbLwf6/4="; }; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { runHook preInstall install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/annapurna-sil-${finalAttrs.version} runHook postInstall ''; @@ -32,4 +32,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.kmein ]; }; -} +})