Merge pull request #130966 from Artturin/straberry

strawberry: add glib-networking to fix  #112334
This commit is contained in:
Sandro 2021-07-22 02:14:32 +02:00 committed by GitHub
commit 99d4811dee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -28,6 +28,7 @@
, qtx11extras
, qttools
, withGstreamer ? true
, glib-networking
, gst_all_1 ? null
, withVlc ? true
, libvlc ? null
@ -69,6 +70,7 @@ mkDerivation rec {
p11-kit
]
++ lib.optionals withGstreamer (with gst_all_1; [
glib-networking
gstreamer
gst-plugins-base
gst-plugins-good
@ -85,8 +87,11 @@ mkDerivation rec {
util-linux
];
postInstall = ''
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
postInstall = lib.optionalString withGstreamer ''
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; {