diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 8f587996f8d5..5d17df8028d2 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -17,6 +17,9 @@ , writeText , gstreamer , gst-plugins-base +, gst-plugins-good +, gst-libav +, gst-vaapi , gtk3 , dconf , buildPackages @@ -67,7 +70,7 @@ let qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { }; qtlottie = callPackage ./modules/qtlottie.nix { }; qtmultimedia = callPackage ./modules/qtmultimedia.nix { - inherit gstreamer gst-plugins-base; + inherit gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; }; qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { }; qtpositioning = callPackage ./modules/qtpositioning.nix { }; diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 5e6dace906dc..bfd33cadf395 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -9,6 +9,9 @@ , alsa-lib , gstreamer , gst-plugins-base +, gst-plugins-good +, gst-libav +, gst-vaapi , libpulseaudio , wayland , elfutils @@ -20,5 +23,6 @@ qtModule { pname = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gstreamer gst-plugins-base libpulseaudio elfutils libunwind alsa-lib wayland orc ]; + buildInputs = [ libpulseaudio elfutils libunwind alsa-lib wayland orc ]; + propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c63cca9c806..73918b3dfd6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21915,7 +21915,7 @@ with pkgs; inherit newScope; inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; inherit bison cups dconf harfbuzz libGL perl gtk3 ninja; - inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; inherit buildPackages; cmake = cmake.overrideAttrs (attrs: { patches = attrs.patches ++ [