pyrox.dev
Merge pull request #335058 from linsui/jami
jami: 20240627.0 -> 20240813.0
+15
-5
pkgs/applications/networking/instant-messengers/jami/default.nix
+15
-5
pkgs/applications/networking/instant-messengers/jami/default.nix
···
34
webrtc-audio-processing,
35
zlib,
36
37
# for client
38
cmake,
39
git,
···
65
66
stdenv.mkDerivation rec {
67
pname = "jami";
68
-
version = "20240627.0";
69
70
src = fetchFromGitLab {
71
domain = "git.jami.net";
72
owner = "savoirfairelinux";
73
repo = "jami-client-qt";
74
rev = "stable/${version}";
75
-
hash = "sha256-aePF1c99ju9y7JEgC+F2BPfpSAZlLd5OI5Jm6i9VlQQ=";
76
fetchSubmodules = true;
77
};
78
···
128
129
dhtnet = stdenv.mkDerivation {
130
pname = "dhtnet";
131
-
version = "unstable-2024-05-17";
132
133
src = fetchFromGitLab {
134
domain = "git.jami.net";
135
owner = "savoirfairelinux";
136
repo = "dhtnet";
137
-
rev = "77331098ff663a5ac54fae7d0bedafe076c575a1";
138
-
hash = "sha256-55LEnI1YgVujCtv1dGOFtJdvnzB2SKqwEptaHasZB7I=";
139
};
140
141
nativeBuildInputs = [
142
cmake
···
34
webrtc-audio-processing,
35
zlib,
36
37
+
# for dhtnet
38
+
expected-lite,
39
+
40
# for client
41
cmake,
42
git,
···
68
69
stdenv.mkDerivation rec {
70
pname = "jami";
71
+
version = "20240813.0";
72
73
src = fetchFromGitLab {
74
domain = "git.jami.net";
75
owner = "savoirfairelinux";
76
repo = "jami-client-qt";
77
rev = "stable/${version}";
78
+
hash = "sha256-XRWbV1s87niwNiWf2KRpV+wUH6ptw3vnVXCEwqh2r7M=";
79
fetchSubmodules = true;
80
};
81
···
131
132
dhtnet = stdenv.mkDerivation {
133
pname = "dhtnet";
134
+
version = "unstable-2024-07-22";
135
136
src = fetchFromGitLab {
137
domain = "git.jami.net";
138
owner = "savoirfairelinux";
139
repo = "dhtnet";
140
+
rev = "cfe512b0632eea046f683b22e42d01eeb943d751";
141
+
hash = "sha256-SGidaCi5z7hO0ePJIZIkcWAkb+cKsZTdksVS7ldpjME=";
142
};
143
+
144
+
postPatch = ''
145
+
substituteInPlace dependencies/build.py \
146
+
--replace-fail \
147
+
"wget https://raw.githubusercontent.com/martinmoene/expected-lite/master/include/nonstd/expected.hpp -O" \
148
+
"cp ${expected-lite}/include/nonstd/expected.hpp"
149
+
'';
150
151
nativeBuildInputs = [
152
cmake