Merge pull request #76592 from snglth/master

flacon: improvements
This commit is contained in:
Dmitry Kalinkin 2020-01-10 11:33:05 -05:00 committed by GitHub
commit f1d3df98d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions

View File

@ -7871,4 +7871,10 @@
githubId = 52650; githubId = 52650;
name = "Marc Busqué"; name = "Marc Busqué";
}; };
snglth = {
email = "illia@ishestakov.com";
github = "snglth";
githubId = 8686360;
name = "Illia Shestakov";
};
} }

View File

@ -1,6 +1,7 @@
{ stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper { stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkgconfig
, shntool, flac, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain , shntool, flac, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain
, gtk3 , gtk3
, qtbase, qttools, wrapQtAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,8 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "05pvg5xhc2azwzld08m81r4b2krqdbcbm5lmdvg2zkk67xq9pqyd"; sha256 = "05pvg5xhc2azwzld08m81r4b2krqdbcbm5lmdvg2zkk67xq9pqyd";
}; };
nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
buildInputs = [ qt5.qtbase qt5.qttools libuchardet ]; buildInputs = [ qtbase qttools libuchardet ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/flacon \ wrapProgram $out/bin/flacon \
@ -29,6 +30,6 @@ stdenv.mkDerivation rec {
homepage = https://flacon.github.io/; homepage = https://flacon.github.io/;
license = licenses.lgpl21; license = licenses.lgpl21;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ nico202 ]; maintainers = with maintainers; [ snglth ];
}; };
} }

View File

@ -18823,7 +18823,7 @@ in
FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; FIL-plugins = callPackage ../applications/audio/FIL-plugins { };
flacon = callPackage ../applications/audio/flacon { }; flacon = libsForQt5.callPackage ../applications/audio/flacon { };
flexget = callPackage ../applications/networking/flexget { }; flexget = callPackage ../applications/networking/flexget { };