diff options
| author | Illia Shestakov <illia@ishestakov.com> | 2019-12-30 15:31:55 +0200 |
|---|---|---|
| committer | Illia Shestakov <illia@ishestakov.com> | 2019-12-30 15:31:55 +0200 |
| commit | 345b192273040ec63240a2ceff45294aee41d618 (patch) | |
| tree | 45573dca4aa22019e73c311a30593005352c031c /pkgs/applications/audio | |
| parent | 435b8862c66833f0437ff14465489edc4c2152ee (diff) | |
| download | nixpkgs-345b192273040ec63240a2ceff45294aee41d618.tar nixpkgs-345b192273040ec63240a2ceff45294aee41d618.tar.gz nixpkgs-345b192273040ec63240a2ceff45294aee41d618.tar.bz2 nixpkgs-345b192273040ec63240a2ceff45294aee41d618.tar.lz nixpkgs-345b192273040ec63240a2ceff45294aee41d618.tar.xz nixpkgs-345b192273040ec63240a2ceff45294aee41d618.tar.zst nixpkgs-345b192273040ec63240a2ceff45294aee41d618.zip | |
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
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/flacon/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index c1ccd6add78..8c37f01c2a0 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -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 , gtk3 +, qtbase, qttools, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -14,8 +15,8 @@ stdenv.mkDerivation rec { sha256 = "05pvg5xhc2azwzld08m81r4b2krqdbcbm5lmdvg2zkk67xq9pqyd"; }; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; - buildInputs = [ qt5.qtbase qt5.qttools libuchardet ]; + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + buildInputs = [ qtbase qttools libuchardet ]; postInstall = '' wrapProgram $out/bin/flacon \ |