qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aleksana 2024-11-21 21:43:12 +08:00 committed by GitHub
commit d76eaf2d1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/networking/instant-messengers/jami/default.nix
View File

@ -24,7 +24,6 @@
libnatpmp, libnatpmp,
libpulseaudio, libpulseaudio,
libupnp, libupnp,
yaml-cpp,
msgpack-cxx, msgpack-cxx,
openssl, openssl,
restinio, restinio,
@ -32,6 +31,7 @@
speex, speex,
udev, udev,
webrtc-audio-processing, webrtc-audio-processing,
yaml-cpp,
zlib, zlib,
# for dhtnet # for dhtnet
@ -68,14 +68,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jami"; pname = "jami";
version = "20240823.0"; version = "20241031.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "git.jami.net"; domain = "git.jami.net";
owner = "savoirfairelinux"; owner = "savoirfairelinux";
repo = "jami-client-qt"; repo = "jami-client-qt";
rev = "stable/${version}"; rev = "stable/${version}";
hash = "sha256-7jGH54sFiS6qrdEiKSS64lJyJXL1FOJVbesxo/FFmyA="; hash = "sha256-LKezdzM+ltUSgW4GmTXICyufx9mI1AVbdEcwSp6tmao=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
domain = "git.jami.net"; domain = "git.jami.net";
owner = "savoirfairelinux"; owner = "savoirfairelinux";
repo = "dhtnet"; repo = "dhtnet";
rev = "cfe512b0632eea046f683b22e42d01eeb943d751"; rev = "8cd00200669fa5b7632faa447ba206c3847e2879";
hash = "sha256-SGidaCi5z7hO0ePJIZIkcWAkb+cKsZTdksVS7ldpjME="; hash = "sha256-SGidaCi5z7hO0ePJIZIkcWAkb+cKsZTdksVS7ldpjME=";
}; };
@ -173,6 +173,8 @@ stdenv.mkDerivation rec {
"-DBUILD_BENCHMARKS=Off" "-DBUILD_BENCHMARKS=Off"
"-DBUILD_TOOLS=Off" "-DBUILD_TOOLS=Off"
"-DBUILD_TESTING=Off" "-DBUILD_TESTING=Off"
"-DBUILD_DEPENDENCIES=Off"
"-DBUILD_EXAMPLE=Off"
]; ];
meta = with lib; { meta = with lib; {
@ -188,6 +190,12 @@ stdenv.mkDerivation rec {
inherit src version meta; inherit src version meta;
sourceRoot = "${src.name}/daemon"; sourceRoot = "${src.name}/daemon";
# Fix for libgit2 breaking changes
postPatch = ''
substituteInPlace src/jamidht/conversationrepository.cpp \
--replace-fail "git_commit* const" "const git_commit*"
'';
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
pkg-config pkg-config
@ -212,7 +220,6 @@ stdenv.mkDerivation rec {
libnatpmp libnatpmp
libpulseaudio libpulseaudio
libupnp libupnp
yaml-cpp
msgpack-cxx msgpack-cxx
opendht-jami opendht-jami
openssl openssl
@ -222,6 +229,7 @@ stdenv.mkDerivation rec {
speex speex
udev udev
webrtc-audio-processing webrtc-audio-processing
yaml-cpp
zlib zlib
]; ];