Merge pull request #130997 from NixOS/backport-130966-to-release-21.05

[Backport release-21.05] strawberry: add glib-networking to fix  #112334
This commit is contained in:
Artturi 2021-08-06 16:27:33 +03:00 committed by GitHub
commit 5cd85f76b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions

View File

@ -28,6 +28,7 @@
, qtx11extras , qtx11extras
, qttools , qttools
, withGstreamer ? true , withGstreamer ? true
, glib-networking
, gst_all_1 ? null , gst_all_1 ? null
, withVlc ? true , withVlc ? true
, libvlc ? null , libvlc ? null
@ -69,6 +70,7 @@ mkDerivation rec {
p11-kit p11-kit
] ]
++ lib.optionals withGstreamer (with gst_all_1; [ ++ lib.optionals withGstreamer (with gst_all_1; [
glib-networking
gstreamer gstreamer
gst-plugins-base gst-plugins-base
gst-plugins-good gst-plugins-good
@ -82,8 +84,11 @@ mkDerivation rec {
util-linux util-linux
]; ];
postInstall = '' postInstall = lib.optionalString withGstreamer ''
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") qtWrapperArgs+=(
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
--prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"
)
''; '';
meta = with lib; { meta = with lib; {