pyrox.dev
baresip: 3.10.1 -> 3.24.0 (#430673)
authored by Michele Guerini Rocco and committed by GitHub fc13021c 627aa545
+29
pkgs/by-name/ba/baresip/fix-modules-path.patch
+29
pkgs/by-name/ba/baresip/fix-modules-path.patch
···
···
1
+
commit 46479c52695cc5f8c01370fd2594468666c45c8e
2
+
Author: rnhmjoj <rnhmjoj@inventati.org>
3
+
Date: Sun Aug 3 00:18:47 2025 +0200
4
+
5
+
Fix the modules path at build time
6
+
7
+
The location of the modules is determined by reading the `module_path`
8
+
setting, which is set to "$out/lib/baresip/modules" when the
9
+
configuration file is generated during the first run. If the package is
10
+
updated and the store path changes, baresip breaks completely, forcing
11
+
the user to manually fix the configuration.
12
+
13
+
This patch fixes the location of the modules at build time, ignoring the
14
+
`module_path` setting, to avoid this issue.
15
+
16
+
diff --git a/src/module.c b/src/module.c
17
+
index 9f2135c6..b62d0bdd 100644
18
+
--- a/src/module.c
19
+
+++ b/src/module.c
20
+
@@ -141,8 +141,7 @@ int module_init(const struct conf *conf)
21
+
if (!conf)
22
+
return EINVAL;
23
+
24
+
- if (conf_get(conf, "module_path", &path))
25
+
- pl_set_str(&path, ".");
26
+
+ pl_set_str(&path, MOD_PATH);
27
+
28
+
err = conf_apply(conf, "module", module_handler, &path);
29
+
if (err)
+78
-66
pkgs/by-name/ba/baresip/package.nix
+78
-66
pkgs/by-name/ba/baresip/package.nix
···
29
zlib,
30
dbusSupport ? true,
31
}:
32
stdenv.mkDerivation rec {
33
-
version = "3.10.1";
34
pname = "baresip";
35
src = fetchFromGitHub {
36
owner = "baresip";
37
repo = "baresip";
38
rev = "v${version}";
39
-
hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo=";
40
};
41
prePatch = ''
42
substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER ""
43
''
44
+ lib.optionalString (!dbusSupport) ''
45
substituteInPlace cmake/modules.cmake --replace-fail 'list(APPEND MODULES ctrl_dbus)' ""
46
'';
47
nativeBuildInputs = [
48
cmake
49
pkg-config
···
102
-D__need_timeval -D__need_timespec -D__need_time_t
103
'';
104
105
-
doInstallCheck = true;
106
# CMake feature detection is prone to breakage between upgrades:
107
# spot-check that the optional modules we care about were compiled
108
-
postInstallCheck = lib.concatMapStringsSep "\n" (m: "test -x $out/lib/baresip/modules/${m}.so") [
109
-
"account"
110
-
"alsa"
111
-
"aubridge"
112
-
"auconv"
113
-
"aufile"
114
-
"auresamp"
115
-
"ausine"
116
-
"avcodec"
117
-
"avfilter"
118
-
"avformat"
119
-
"cons"
120
-
"contact"
121
-
"ctrl_dbus"
122
-
"ctrl_tcp"
123
-
"debug_cmd"
124
-
"dtls_srtp"
125
-
"ebuacip"
126
-
"echo"
127
-
"evdev"
128
-
"fakevideo"
129
-
"g711"
130
-
"g722"
131
-
"g726"
132
-
"gst"
133
-
"gtk"
134
-
"httpd"
135
-
"httpreq"
136
-
"ice"
137
-
"l16"
138
-
"menu"
139
-
"mixausrc"
140
-
"mixminus"
141
-
"multicast"
142
-
"mwi"
143
-
"natpmp"
144
-
"netroam"
145
-
"pcp"
146
-
"pipewire"
147
-
"plc"
148
-
"portaudio"
149
-
"presence"
150
-
"rtcpsummary"
151
-
"sdl"
152
-
"selfview"
153
-
"serreg"
154
-
"snapshot"
155
-
"sndfile"
156
-
"srtp"
157
-
"stdio"
158
-
"stun"
159
-
"swscale"
160
-
"syslog"
161
-
"turn"
162
-
"uuid"
163
-
"v4l2"
164
-
"vidbridge"
165
-
"vidinfo"
166
-
"vp8"
167
-
"vp9"
168
-
"vumeter"
169
-
"x11"
170
-
];
171
172
meta = {
173
description = "Modular SIP User-Agent with audio and video support";
···
175
maintainers = with lib.maintainers; [
176
raskin
177
ehmry
178
];
179
mainProgram = "baresip";
180
license = lib.licenses.bsd3;
···
29
zlib,
30
dbusSupport ? true,
31
}:
32
+
33
stdenv.mkDerivation rec {
34
+
version = "3.24.0";
35
pname = "baresip";
36
+
37
src = fetchFromGitHub {
38
owner = "baresip";
39
repo = "baresip";
40
rev = "v${version}";
41
+
hash = "sha256-32XyMblHF+ST+TpIbdyPFdRtWnIugYMr4lYZnfeFm/c=";
42
};
43
+
44
+
patches = [
45
+
./fix-modules-path.patch
46
+
];
47
+
48
prePatch = ''
49
substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER ""
50
''
51
+ lib.optionalString (!dbusSupport) ''
52
substituteInPlace cmake/modules.cmake --replace-fail 'list(APPEND MODULES ctrl_dbus)' ""
53
'';
54
+
55
nativeBuildInputs = [
56
cmake
57
pkg-config
···
110
-D__need_timeval -D__need_timespec -D__need_time_t
111
'';
112
113
# CMake feature detection is prone to breakage between upgrades:
114
# spot-check that the optional modules we care about were compiled
115
+
installCheckPhase = ''
116
+
runHook preInstallCheck
117
+
${lib.concatMapStringsSep "\n" (m: "test -x $out/lib/baresip/modules/${m}.so") [
118
+
"account"
119
+
"alsa"
120
+
"aubridge"
121
+
"auconv"
122
+
"aufile"
123
+
"auresamp"
124
+
"ausine"
125
+
"avcodec"
126
+
"avfilter"
127
+
"avformat"
128
+
"cons"
129
+
"contact"
130
+
"ctrl_dbus"
131
+
"ctrl_tcp"
132
+
"debug_cmd"
133
+
"dtls_srtp"
134
+
"ebuacip"
135
+
"echo"
136
+
"evdev"
137
+
"fakevideo"
138
+
"g711"
139
+
"g722"
140
+
"g726"
141
+
"gst"
142
+
"gtk"
143
+
"httpd"
144
+
"httpreq"
145
+
"ice"
146
+
"l16"
147
+
"menu"
148
+
"mixausrc"
149
+
"mixminus"
150
+
"multicast"
151
+
"mwi"
152
+
"natpmp"
153
+
"netroam"
154
+
"pcp"
155
+
"pipewire"
156
+
"plc"
157
+
"portaudio"
158
+
"presence"
159
+
"rtcpsummary"
160
+
"sdl"
161
+
"selfview"
162
+
"serreg"
163
+
"snapshot"
164
+
"sndfile"
165
+
"srtp"
166
+
"stdio"
167
+
"stun"
168
+
"swscale"
169
+
"syslog"
170
+
"turn"
171
+
"uuid"
172
+
"v4l2"
173
+
"vidbridge"
174
+
"vidinfo"
175
+
"vp8"
176
+
"vp9"
177
+
"vumeter"
178
+
"x11"
179
+
]}
180
+
runHook postInstallCheck
181
+
'';
182
183
meta = {
184
description = "Modular SIP User-Agent with audio and video support";
···
186
maintainers = with lib.maintainers; [
187
raskin
188
ehmry
189
+
rnhmjoj
190
];
191
mainProgram = "baresip";
192
license = lib.licenses.bsd3;
+2
-2
pkgs/by-name/li/libre/package.nix
+2
-2
pkgs/by-name/li/libre/package.nix