pyrox.dev / nixpkgs
lol
fork atom

kid3: migrate to by-name (#348264)

authored by Aleksana and committed by GitHub d8135539 48d51ff3

+74 -67
unified split
+71 -63
pkgs/applications/audio/kid3/default.nix pkgs/by-name/ki/kid3/package.nix
··· 1 - { chromaprint 2 - , cmake 3 - , docbook_xml_dtd_45 4 - , docbook_xsl 5 - , fetchurl 6 - , ffmpeg 7 - , flac 8 - , id3lib 9 - , kdePackages 10 - , lib 11 - , libogg 12 - , libvorbis 13 - , libxslt 14 - , mp4v2 15 - , pkg-config 16 - , python3 17 - , qtbase 18 - , qtdeclarative 19 - , qtmultimedia 20 - , qttools 21 - , readline 22 - , stdenv 23 - , taglib 24 - , wrapQtAppsHook 25 - , zlib 26 - , withCLI ? true 27 - , withKDE ? true 28 - , withQt ? false 1 + { 2 + lib, 3 + chromaprint, 4 + cmake, 5 + docbook_xml_dtd_45, 6 + docbook_xsl, 7 + fetchurl, 8 + ffmpeg, 9 + flac, 10 + id3lib, 11 + kdePackages, 12 + libogg, 13 + libvorbis, 14 + libxslt, 15 + mp4v2, 16 + pkg-config, 17 + python3, 18 + qt6, 19 + readline, 20 + stdenv, 21 + taglib, 22 + zlib, 23 + # Boolean flags 24 + withCLI ? true, 25 + withKDE ? true, 26 + withQt ? false, 29 27 }: 30 28 31 29 let 32 - inherit (lib) optionals; 30 + inherit (qt6) 31 + qtbase 32 + qtdeclarative 33 + qtmultimedia 34 + qttools 35 + wrapQtAppsHook 36 + ; 33 37 34 38 apps = lib.concatStringsSep ";" ( 35 - optionals withCLI [ "CLI" ] 36 - ++ optionals withKDE [ "KDE" ] 37 - ++ optionals withQt [ "Qt" ] 39 + lib.optionals withCLI [ "CLI" ] ++ lib.optionals withKDE [ "KDE" ] ++ lib.optionals withQt [ "Qt" ] 38 40 ); 39 41 40 - mainProgram = 41 - if withQt then "kid3-qt" 42 - else if withKDE then "kid3" 43 - else "kid3-cli"; 44 - 45 42 in 46 43 stdenv.mkDerivation (finalAttrs: { 47 44 pname = "kid3"; ··· 62 59 wrapQtAppsHook 63 60 ]; 64 61 65 - buildInputs = [ 66 - chromaprint 67 - ffmpeg 68 - flac 69 - id3lib 70 - libogg 71 - libvorbis 72 - libxslt 73 - mp4v2 74 - qtbase 75 - qtdeclarative 76 - qtmultimedia 77 - readline 78 - taglib 79 - zlib 80 - ] ++ lib.optionals withKDE (with kdePackages; [ 81 - kconfig 82 - kconfigwidgets 83 - kcoreaddons 84 - kio 85 - kxmlgui 86 - phonon 87 - ]); 62 + buildInputs = 63 + [ 64 + chromaprint 65 + ffmpeg 66 + flac 67 + id3lib 68 + libogg 69 + libvorbis 70 + libxslt 71 + mp4v2 72 + qtbase 73 + qtdeclarative 74 + qtmultimedia 75 + readline 76 + taglib 77 + zlib 78 + ] 79 + ++ lib.optionals withKDE ( 80 + with kdePackages; 81 + [ 82 + kconfig 83 + kconfigwidgets 84 + kcoreaddons 85 + kio 86 + kxmlgui 87 + phonon 88 + ] 89 + ); 88 90 89 91 cmakeFlags = [ (lib.cmakeFeature "WITH_APPS" apps) ]; 90 92 ··· 95 97 }; 96 98 97 99 meta = { 98 - description = "Simple and powerful audio tag editor"; 99 - inherit mainProgram; 100 100 homepage = "https://kid3.kde.org/"; 101 - license = lib.licenses.lgpl2Plus; 101 + description = "Simple and powerful audio tag editor"; 102 102 longDescription = '' 103 103 If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, 104 104 MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF files (e.g. full ··· 128 128 - Edit synchronized lyrics and event timing codes, import and export 129 129 LRC files. 130 130 ''; 131 + license = lib.licenses.lgpl2Plus; 132 + mainProgram = 133 + if withQt then 134 + "kid3-qt" 135 + else if withKDE then 136 + "kid3" 137 + else 138 + "kid3-cli"; 131 139 maintainers = with lib.maintainers; [ AndersonTorres ]; 132 140 platforms = lib.platforms.linux; 133 141 };
+3 -4
pkgs/top-level/all-packages.nix
··· 30330 30330 30331 30331 khard = callPackage ../applications/misc/khard { }; 30332 30332 30333 - kid3-cli = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = false; }; 30334 - kid3-kde = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = true; withQt = false; }; 30335 - kid3-qt = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; 30336 - kid3 = kid3-kde; 30333 + kid3-cli = kid3.override { withCLI = true; withKDE = false; withQt = false; }; 30334 + kid3-kde = kid3.override { withCLI = true; withKDE = true; withQt = false; }; 30335 + kid3-qt = kid3.override { withCLI = true; withKDE = false; withQt = true; }; 30337 30336 30338 30337 kile = callPackage ../applications/editors/kile { }; 30339 30338