Merge pull request #294284 from Aleksanaa/gstreamer-libsoup3-fix

treewide: remove gst-plugins-good missing libsoup_3 workaround
This commit is contained in:
a-n-n-a-l-e-e
2024-03-08 08:00:59 -08:00
committed by GitHub
4 changed files with 0 additions and 21 deletions
@@ -19,7 +19,6 @@
# GStreamer
, glib-networking
, gst_all_1
, libsoup_3
# User-agent info
, lsb-release
# rt2rtng
@@ -100,8 +99,6 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ dbus ]})
wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH
# for GStreamer
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.getLib libsoup_3}/lib")
'';
meta = with lib; {
@@ -14,7 +14,6 @@
, gst_all_1
, glib-networking
, darwin
, libsoup_3
}:
stdenv.mkDerivation rec {
@@ -69,12 +68,6 @@ stdenv.mkDerivation rec {
darwin.apple_sdk_11_0.frameworks.IOKit
];
# FIXME: gst-plugins-good missing libsoup breaks streaming
# (https://github.com/nixos/nixpkgs/issues/271960)
preFixup = ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsoup_3 ]}")
'';
meta = with lib; {
description = "Linux/macOS media player based on GStreamer and GTK";
homepage = "https://philn.github.io/glide";
-4
View File
@@ -6,7 +6,6 @@
, gobject-introspection
, yt-dlp
, libadwaita
, libsoup_3
, glib-networking
, nix-update-script
}:
@@ -38,7 +37,6 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
libadwaita
# needed for gstreamer https
libsoup_3
glib-networking
] ++ (with gst_all_1; [
gst-plugins-base
@@ -53,8 +51,6 @@ python3Packages.buildPythonApplication rec {
gappsWrapperArgs+=(
--prefix PYTHONPATH : "$program_PYTHONPATH"
--prefix PATH : "${lib.makeBinPath [yt-dlp]}"
# needed for gstreamer https
--prefix LD_LIBRARY_PATH : "${lib.getLib libsoup_3}/lib"
)
'';
@@ -18,7 +18,6 @@
, libadwaita
, glib-networking
, gst_all_1
, libsoup_3
}:
stdenv.mkDerivation rec {
@@ -71,12 +70,6 @@ stdenv.mkDerivation rec {
gst-plugins-ugly
]);
# FIXME: gst-plugins-good missing libsoup breaks streaming
# (https://github.com/nixos/nixpkgs/issues/271960)
preFixup = ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsoup_3 ]}")
'';
meta = with lib; {
description = "A Rust + GTK based netease cloud music player";
homepage = "https://github.com/gmg137/netease-cloud-music-gtk";