From aedf74603ab156d5353389d872c87744f4102b8a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 12 Jan 2025 17:46:13 +0100 Subject: [PATCH] taglib: Modernise - Set strictDeps - Use lib.cmake* for cmakeFlags - Drop meta-wide "with lib" - Correct meta.license: COPYING.LGPL on the repo is version 2.1, no plus clauses used in code - Add meta.platforms --- pkgs/by-name/ta/taglib/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ta/taglib/package.nix b/pkgs/by-name/ta/taglib/package.nix index 684a37f0172f..865ee774ddee 100644 --- a/pkgs/by-name/ta/taglib/package.nix +++ b/pkgs/by-name/ta/taglib/package.nix @@ -18,21 +18,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; }; + strictDeps = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) # Workaround unconditional ${prefix} until upstream is fixed: # https://github.com/taglib/taglib/issues/1098 - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { + meta = { homepage = "https://taglib.org/"; description = "Library for reading and editing audio file metadata"; mainProgram = "taglib-config"; @@ -42,14 +44,15 @@ stdenv.mkDerivation (finalAttrs: { files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files. ''; - license = with licenses; [ - lgpl3 + license = with lib.licenses; [ + lgpl21Only mpl11 ]; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel ]; pkgConfigModules = [ "taglib" "taglib_c" ]; + platforms = lib.platforms.all; }; })