From cb820210e8c0e70481590a009c96c48cb75969bd Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 6 Aug 2023 12:34:05 +0200 Subject: [PATCH] kid3: use `finalAttrs` pattern --- pkgs/applications/audio/kid3/default.nix | 28 +++++++++++++----------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 3b59806592fd..5dacefa2955c 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,13 +1,13 @@ -{ lib -, stdenv -, fetchurl -, chromaprint +{ + chromaprint , cmake , docbook_xml_dtd_45 , docbook_xsl +, fetchurl , ffmpeg , flac , id3lib +, lib , libogg , libvorbis , libxslt @@ -20,18 +20,19 @@ , qtquickcontrols , qttools , readline +, stdenv , taglib , wrapQtAppsHook , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kid3"; version = "3.9.4"; src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xBCWDpYiXeChxIiMPqHG3CyiRau2kUdDJtzcPtvWpSA="; + url = "https://download.kde.org/stable/kid3/${finalAttrs.version}/kid3-${finalAttrs.version}.tar.xz"; + hash = "sha256-xBCWDpYiXeChxIiMPqHG3CyiRau2kUdDJtzcPtvWpSA="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { python3 wrapQtAppsHook ]; + buildInputs = [ chromaprint ffmpeg @@ -68,9 +70,10 @@ stdenv.mkDerivation rec { export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/" ''; - meta = with lib; { - homepage = "https://kid3.kde.org/"; + meta = { description = "A simple and powerful audio tag editor"; + homepage = "https://kid3.kde.org/"; + license = lib.licenses.lgpl2Plus; longDescription = '' If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF files (e.g. full @@ -100,8 +103,7 @@ stdenv.mkDerivation rec { - Edit synchronized lyrics and event timing codes, import and export LRC files. ''; - license = licenses.lgpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +})