From 0fd8bf0e588092ec02bedbced282e52f6904765e Mon Sep 17 00:00:00 2001 From: "Ali K. Hamze" <6139089+alikhamze@users.noreply.github.com> Date: Mon, 17 Aug 2026 08:21:52 -0400 Subject: [PATCH] treewide: drop gst-vaapi Not-cherry-picked-because: this commit modified many files, leading to merge conflicts when cherry-picking. --- pkgs/by-name/pi/picard/package.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/pi/picard/package.nix b/pkgs/by-name/pi/picard/package.nix index db9009ebaedf..51336472ded0 100644 --- a/pkgs/by-name/pi/picard/package.nix +++ b/pkgs/by-name/pi/picard/package.nix @@ -45,17 +45,13 @@ pythonPackages.buildPythonApplication (finalAttrs: { ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform qt5.qtwayland) [ qt5.qtwayland ] - ++ lib.optionals (pyqt5.multimediaEnabled) ( - [ - qt5.qtmultimedia.bin - gst_all_1.gst-libav - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - ] - ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform gst_all_1.gst-vaapi) [ - gst_all_1.gst-vaapi - ] - ); + ++ lib.optionals (pyqt5.multimediaEnabled) [ + qt5.qtmultimedia.bin + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + ]; pythonRelaxDeps = lib.optionals stdenv.hostPlatform.isDarwin [ # Should be resolved in the next version