From e1c3bbfdc844814fbc132b102e3c3729bdca9d90 Mon Sep 17 00:00:00 2001 From: Illia Shestakov Date: Sat, 30 May 2020 16:30:15 +0300 Subject: [PATCH] flacon: 5.5.1 -> 6.0.0 Also applied nixfmt Moved bin_path to separate attribute to allow overriding Fixed description --- pkgs/applications/audio/flacon/default.nix | 29 ++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 1da40e754153..df563bc38406 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -1,32 +1,41 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkgconfig -, shntool, flac, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain -, gtk3 -, qtbase, qttools, wrapQtAppsHook -}: +{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkgconfig, shntool, flac +, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain, gtk3, qtbase +, qttools, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "flacon"; - version = "5.5.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "05pvg5xhc2azwzld08m81r4b2krqdbcbm5lmdvg2zkk67xq9pqyd"; + sha256 = "0p5z6rwckda0lkljrrvx6i90fazj53cxg9pasfmi8154j1z72dj2"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; buildInputs = [ qtbase qttools libuchardet ]; + bin_path = lib.makeBinPath [ + shntool + flac + opusTools + vorbis-tools + mp3gain + lame + wavpack + vorbisgain + ]; + postInstall = '' wrapProgram $out/bin/flacon \ --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \ - --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbis-tools - mp3gain lame wavpack vorbisgain ]}" + --prefix PATH : "$bin_path"; ''; meta = with stdenv.lib; { - description = "Extracts audio tracks from an audio CD image to separate tracks."; + description = + "Extracts audio tracks from an audio CD image to separate tracks"; homepage = "https://flacon.github.io/"; license = licenses.lgpl21; platforms = platforms.linux;