From 345b192273040ec63240a2ceff45294aee41d618 Mon Sep 17 00:00:00 2001 From: Illia Shestakov Date: Mon, 30 Dec 2019 15:31:55 +0200 Subject: [PATCH 1/2] 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 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 \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84c3e3aef69..95d6ee78e30 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 { }; From 07d0acfe458cfe6d2ed0bbaf82500744ee299197 Mon Sep 17 00:00:00 2001 From: Illia Shestakov Date: Sat, 28 Dec 2019 17:17:08 +0200 Subject: [PATCH 2/2] flacon: change maintainer to snglth --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/audio/flacon/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4952972eb4d..2cfc9bca333 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7782,4 +7782,10 @@ githubId = 52650; name = "Marc Busqué"; }; + snglth = { + email = "illia@ishestakov.com"; + github = "snglth"; + githubId = 8686360; + name = "Illia Shestakov"; + }; } diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 8c37f01c2a0..eb39309a254 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = https://flacon.github.io/; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ nico202 ]; + maintainers = with maintainers; [ snglth ]; }; }