pyrox.dev
Merge #276408: gst_all_1.gst-plugins-good: dlopen libsoup_3 with an absolute path
...into staging
+1
-2
pkgs/development/libraries/gstreamer/core/setup-hook.sh
+1
-2
pkgs/development/libraries/gstreamer/core/setup-hook.sh
···
1
1
addGstreamer1LibPath () {
2
2
if test -d "$1/lib/gstreamer-1.0"
3
3
then
4
-
export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0-}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0"
4
+
addToSearchPath GST_PLUGIN_SYSTEM_PATH_1_0 "$1/lib/gstreamer-1.0"
5
5
fi
6
6
}
7
7
8
8
addEnvHooks "$hostOffset" addGstreamer1LibPath
9
-
+13
-3
pkgs/development/libraries/gstreamer/good/default.nix
+13
-3
pkgs/development/libraries/gstreamer/good/default.nix
···
1
1
{ lib, stdenv
2
2
, fetchurl
3
-
, fetchpatch
3
+
, substituteAll
4
4
, meson
5
5
, nasm
6
6
, ninja
···
24
24
, gdk-pixbuf
25
25
, aalib
26
26
, libcaca
27
-
, libsoup
27
+
, libsoup_3
28
28
, libpulseaudio
29
29
, libintl
30
+
, libxml2
30
31
, Cocoa
31
32
, lame
32
33
, mpg123
···
63
64
hash = "sha256-JpWfz+v/9jfU6gjvQDFrrzG2G7dymCCwaE6ADDoUeLY=";
64
65
};
65
66
67
+
patches = [
68
+
# dlopen libsoup_3 with an absolute path
69
+
(substituteAll {
70
+
src = ./souploader.diff;
71
+
nixLibSoup3Path = "${lib.getLib libsoup_3}/lib";
72
+
})
73
+
];
74
+
66
75
strictDeps = true;
67
76
68
77
depsBuildBuild = [ pkg-config ];
···
102
111
gdk-pixbuf
103
112
aalib
104
113
libcaca
105
-
libsoup
114
+
libsoup_3
106
115
libshout
116
+
libxml2
107
117
lame
108
118
mpg123
109
119
twolame
+13
pkgs/development/libraries/gstreamer/good/souploader.diff
+13
pkgs/development/libraries/gstreamer/good/souploader.diff
···
1
+
diff --git a/ext/soup/gstsouploader.c b/ext/soup/gstsouploader.c
2
+
index 85048ce303..d7d818cf95 100644
3
+
--- a/ext/soup/gstsouploader.c
4
+
+++ b/ext/soup/gstsouploader.c
5
+
@@ -181,7 +181,7 @@ gst_soup_load_library (void)
6
+
GST_DEBUG ("LibSoup 2 found");
7
+
} else {
8
+
GST_DEBUG ("Trying all libsoups");
9
+
- libsoup_sonames[0] = LIBSOUP_3_SONAME;
10
+
+ libsoup_sonames[0] = "@nixLibSoup3Path@/" LIBSOUP_3_SONAME;
11
+
libsoup_sonames[1] = LIBSOUP_2_SONAME;
12
+
}
13
+