diff options
| author | linsui <linsui555@gmail.com> | 2022-11-18 12:07:19 +0800 |
|---|---|---|
| committer | linsui <linsui555@gmail.com> | 2022-11-18 12:07:30 +0800 |
| commit | 6b237a4a0688b633b1321501cefa008adb0be073 (patch) | |
| tree | a7dfcb61674df8256c9e8eb9dc8330d68a036d44 /pkgs/applications/networking/instant-messengers/jami | |
| parent | a14e29ab8186fa133e0e9923eab7cb29b3dc3c99 (diff) | |
jami: 20220825.0828.c10f01f -> 20221031.1308.130cc26
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/jami')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jami/client.nix (renamed from pkgs/applications/networking/instant-messengers/jami/client-qt.nix) | 16 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jami/default.nix | 6 |
2 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix b/pkgs/applications/networking/instant-messengers/jami/client.nix index 7733b05168b61..2ce1aba4af55d 100644 --- a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix +++ b/pkgs/applications/networking/instant-messengers/jami/client.nix @@ -2,6 +2,7 @@ , src , jami-meta , lib +, fetchpatch , stdenv , pkg-config , cmake @@ -25,13 +26,20 @@ }: stdenv.mkDerivation { - pname = "jami-client-qt"; + pname = "jami-client"; inherit version src; sourceRoot = "source/client-qt"; + patches = [ + (fetchpatch { + name = "fix-build-without-webengine.patch"; + url = "https://git.jami.net/savoirfairelinux/jami-client-qt/-/commit/9b2dbb64eaa9256f800dfa69d897545f4b0affd2.patch"; + hash = "sha256-lgDlSlXIjtdymBa7xSe1PabSK9DnSG5KnJggOLWyn+A="; + }) + ]; + preConfigure = '' - python gen-resources.py echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h ''; @@ -61,8 +69,8 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DRING_BUILD_DIR=${jami-daemon}/include" - "-DRING_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" + "-DLIBJAMI_INCLUDE_DIR=${jami-daemon}/include/jami" + "-DLIBJAMI_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" ] ++ lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ]; diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index a2d53141f413d..92fbe4d45e170 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -12,11 +12,11 @@ }: let - version = "20220825.0828.c10f01f"; + version = "20221031.1308.130cc26"; src = fetchzip { url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - hash = "sha256-axQYU7+kOFE9SnI8fR4F6NFvD9ITZ85UJhg5OVniSlg="; + hash = "sha256-+xpSoSsG+G+w8+g0FhXx+6Phroj83ijW8xWvYO+kdqY="; stripRoot = false; postFetch = '' @@ -87,7 +87,7 @@ rec { inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami; }; - jami-client-qt = qt6Packages.callPackage ./client-qt.nix { + jami-client = qt6Packages.callPackage ./client.nix { inherit version src jami-meta ffmpeg-jami; }; } |