From f1a6437259a395d20d96bbed23c3149a69a847e2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 30 May 2023 10:32:41 +0300 Subject: [PATCH] picard: Fix inputs Add qt5.qtwayland - for the wrapper. Put most qt5 inputs in `buildInputs` - not `nativeBuildInputs`. Remove `fetchpatch` unused argument. --- pkgs/applications/audio/picard/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 4e7323b128b..983457530ad 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,7 +1,6 @@ { lib , python3Packages , fetchFromGitHub -, fetchpatch , gettext , chromaprint , qt5 @@ -28,16 +27,22 @@ pythonPackages.buildPythonApplication rec { sha256 = "sha256-ukqlAXGaqX89U77cM9Ux0RYquT31Ho8ri1Ue7S3+MwQ="; }; - nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] - ++ lib.optionals (pyqt5.multimediaEnabled) [ - qt5.qtmultimedia.bin + nativeBuildInputs = [ + gettext + qt5.wrapQtAppsHook + ] ++ lib.optionals (pyqt5.multimediaEnabled) [ gst_all_1.gst-libav gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-vaapi gst_all_1.gstreamer - ] - ; + ]; + buildInputs = [ + qt5.qtbase + qt5.qtwayland + ] ++ lib.optionals (pyqt5.multimediaEnabled) [ + qt5.qtmultimedia.bin + ]; propagatedBuildInputs = with pythonPackages; [ chromaprint