flacon: improvements
1. Use libsForQt5.callPackage instead of raw callPackage` (this adds ability to import qtbase and qttools directly instead of importing whole qt5) 2. Include wrapQtAppsHook in nativeBuildInputs The major point of this changes is to provide support for running support flacon under wayland session, but it may help in some other use cases Closes #76588
This commit is contained in:
parent
435b8862c6
commit
345b192273
|
@ -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 \
|
||||||
|
|
|
@ -18761,7 +18761,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 { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue