From 345b192273040ec63240a2ceff45294aee41d618 Mon Sep 17 00:00:00 2001
From: Illia Shestakov <illia@ishestakov.com>
Date: Mon, 30 Dec 2019 15:31:55 +0200
Subject: [PATCH] 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
---
 pkgs/applications/audio/flacon/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index c1ccd6add78a..8c37f01c2a03 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 \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84c3e3aef693..95d6ee78e30a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18761,7 +18761,7 @@ in
 
   FIL-plugins = callPackage ../applications/audio/FIL-plugins { };
 
-  flacon = callPackage ../applications/audio/flacon { };
+  flacon = libsForQt5.callPackage ../applications/audio/flacon { };
 
   flexget = callPackage ../applications/networking/flexget { };