diff options
author | Nick Cao <nickcao@nichi.co> | 2022-11-05 00:41:12 +0800 |
---|---|---|
committer | Nick Cao <nickcao@nichi.co> | 2022-11-05 21:39:11 +0800 |
commit | e177a194c0c4cf0e80258ddef3a38e018b4d44cd (patch) | |
tree | 81915786308b96a8e9da7cf4bd6b7ce82373ab47 | |
parent | f2870ff9e2e35e4e338fd8af9483394605f1585f (diff) |
qt6.qtmultimedia: add and propagate the required/recommended gst plugins
reference: https://doc.qt.io/qt-6/videooverview.html#linux
-rw-r--r-- | pkgs/development/libraries/qt-6/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtmultimedia.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 8f587996f8d5a..5d17df8028d2e 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 5e6dace906dcd..bfd33cadf395f 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 8c63cca9c8060..73918b3dfd6c8 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 ++ [ |