diff options
| author | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2023-12-23 12:12:12 +0000 |
|---|---|---|
| committer | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2023-12-29 12:32:50 +0000 |
| commit | f465c29e045b32d8821f4d7b834f025db2f27c84 (patch) | |
| tree | 1e6ca86da317ff610f18542648df090a674af50e /pkgs/development/libraries/gstreamer | |
| parent | a5650ee564f1bd0f5d1258da37e6366cf45a9d2b (diff) | |
gst_all_1.gst-plugins-good: dlopen libsoup_3 with an absolute path
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
3 files changed, 27 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh index 026a4e5f55a00..43d839eac7a72 100644 --- a/pkgs/development/libraries/gstreamer/core/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh @@ -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 - diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 6bea243146953..208d9c4bd50ff 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, fetchpatch +, substituteAll , meson , nasm , ninja @@ -24,9 +24,10 @@ , gdk-pixbuf , aalib , libcaca -, libsoup +, libsoup_3 , libpulseaudio , libintl +, libxml2 , Cocoa , lame , mpg123 @@ -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 ]; @@ -102,8 +111,9 @@ stdenv.mkDerivation rec { gdk-pixbuf aalib libcaca - libsoup + libsoup_3 libshout + libxml2 lame mpg123 twolame diff --git a/pkgs/development/libraries/gstreamer/good/souploader.diff b/pkgs/development/libraries/gstreamer/good/souploader.diff new file mode 100644 index 0000000000000..8662207de8f2f --- /dev/null +++ b/pkgs/development/libraries/gstreamer/good/souploader.diff @@ -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; + } + |