pyrox.dev / nixpkgs
lol
fork atom

jami: 20240823 -> 20241031.0; fix build with libgit2 1.8.4 (#356712)

authored by Aleksana and committed by GitHub d76eaf2d 376b19bf

+13 -5
unified split
+13 -5
pkgs/applications/networking/instant-messengers/jami/default.nix
··· 24 libnatpmp, 25 libpulseaudio, 26 libupnp, 27 - yaml-cpp, 28 msgpack-cxx, 29 openssl, 30 restinio, ··· 32 speex, 33 udev, 34 webrtc-audio-processing, 35 zlib, 36 37 # for dhtnet ··· 68 69 stdenv.mkDerivation rec { 70 pname = "jami"; 71 - version = "20240823.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-7jGH54sFiS6qrdEiKSS64lJyJXL1FOJVbesxo/FFmyA="; 79 fetchSubmodules = true; 80 }; 81 ··· 137 domain = "git.jami.net"; 138 owner = "savoirfairelinux"; 139 repo = "dhtnet"; 140 - rev = "cfe512b0632eea046f683b22e42d01eeb943d751"; 141 hash = "sha256-SGidaCi5z7hO0ePJIZIkcWAkb+cKsZTdksVS7ldpjME="; 142 }; 143 ··· 173 "-DBUILD_BENCHMARKS=Off" 174 "-DBUILD_TOOLS=Off" 175 "-DBUILD_TESTING=Off" 176 ]; 177 178 meta = with lib; { ··· 188 inherit src version meta; 189 sourceRoot = "${src.name}/daemon"; 190 191 nativeBuildInputs = [ 192 autoreconfHook 193 pkg-config ··· 212 libnatpmp 213 libpulseaudio 214 libupnp 215 - yaml-cpp 216 msgpack-cxx 217 opendht-jami 218 openssl ··· 222 speex 223 udev 224 webrtc-audio-processing 225 zlib 226 ]; 227
··· 24 libnatpmp, 25 libpulseaudio, 26 libupnp, 27 msgpack-cxx, 28 openssl, 29 restinio, ··· 31 speex, 32 udev, 33 webrtc-audio-processing, 34 + yaml-cpp, 35 zlib, 36 37 # for dhtnet ··· 68 69 stdenv.mkDerivation rec { 70 pname = "jami"; 71 + version = "20241031.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-LKezdzM+ltUSgW4GmTXICyufx9mI1AVbdEcwSp6tmao="; 79 fetchSubmodules = true; 80 }; 81 ··· 137 domain = "git.jami.net"; 138 owner = "savoirfairelinux"; 139 repo = "dhtnet"; 140 + rev = "8cd00200669fa5b7632faa447ba206c3847e2879"; 141 hash = "sha256-SGidaCi5z7hO0ePJIZIkcWAkb+cKsZTdksVS7ldpjME="; 142 }; 143 ··· 173 "-DBUILD_BENCHMARKS=Off" 174 "-DBUILD_TOOLS=Off" 175 "-DBUILD_TESTING=Off" 176 + "-DBUILD_DEPENDENCIES=Off" 177 + "-DBUILD_EXAMPLE=Off" 178 ]; 179 180 meta = with lib; { ··· 190 inherit src version meta; 191 sourceRoot = "${src.name}/daemon"; 192 193 + # Fix for libgit2 breaking changes 194 + postPatch = '' 195 + substituteInPlace src/jamidht/conversationrepository.cpp \ 196 + --replace-fail "git_commit* const" "const git_commit*" 197 + ''; 198 + 199 nativeBuildInputs = [ 200 autoreconfHook 201 pkg-config ··· 220 libnatpmp 221 libpulseaudio 222 libupnp 223 msgpack-cxx 224 opendht-jami 225 openssl ··· 229 speex 230 udev 231 webrtc-audio-processing 232 + yaml-cpp 233 zlib 234 ]; 235