Skip to content

gst_all_1.gst-plugins-good: dlopen libsoup_3 with an absolute path #276408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcunat merged 1 commit into from Feb 29, 2024
Merged

gst_all_1.gst-plugins-good: dlopen libsoup_3 with an absolute path #276408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkgs/development/libraries/gstreamer/core/setup-hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
addGstreamer1LibPath () {
if test -d "$1/lib/gstreamer-1.0"
then
export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0-}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0"
addToSearchPath GST_PLUGIN_SYSTEM_PATH_1_0 "$1/lib/gstreamer-1.0"
fi
}

addEnvHooks "$hostOffset" addGstreamer1LibPath

16 changes: 13 additions & 3 deletions pkgs/development/libraries/gstreamer/good/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, substituteAll
, meson
, nasm
, ninja
Expand All @@ -24,9 +24,10 @@
, gdk-pixbuf
, aalib
, libcaca
, libsoup
, libsoup_3
, libpulseaudio
, libintl
, libxml2
, Cocoa
, lame
, mpg123
Expand Down Expand Up @@ -63,6 +64,14 @@ stdenv.mkDerivation rec {
hash = "sha256-4wW58H9SdDykgdoKTgx2w179YK2vGwaU6zuwIeITfjk=";
};

patches = [
# dlopen libsoup_3 with an absolute path
(substituteAll {
src = ./souploader.diff;
nixLibSoup3Path = "${lib.getLib libsoup_3}/lib";
})
];

strictDeps = true;

depsBuildBuild = [ pkg-config ];
Expand Down Expand Up @@ -102,8 +111,9 @@ stdenv.mkDerivation rec {
gdk-pixbuf
aalib
libcaca
libsoup
libsoup_3
libshout
libxml2
lame
mpg123
twolame
Expand Down
13 changes: 13 additions & 0 deletions pkgs/development/libraries/gstreamer/good/souploader.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/ext/soup/gstsouploader.c b/ext/soup/gstsouploader.c
index 85048ce303..d7d818cf95 100644
--- a/ext/soup/gstsouploader.c
+++ b/ext/soup/gstsouploader.c
@@ -181,7 +181,7 @@ gst_soup_load_library (void)
GST_DEBUG ("LibSoup 2 found");
} else {
GST_DEBUG ("Trying all libsoups");
- libsoup_sonames[0] = LIBSOUP_3_SONAME;
+ libsoup_sonames[0] = "@nixLibSoup3Path@/" LIBSOUP_3_SONAME;
libsoup_sonames[1] = LIBSOUP_2_SONAME;
}