From 6b237a4a0688b633b1321501cefa008adb0be073 Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 18 Nov 2022 12:07:19 +0800 Subject: jami: 20220825.0828.c10f01f -> 20221031.1308.130cc26 --- .../instant-messengers/jami/client-qt.nix | 78 -------------------- .../networking/instant-messengers/jami/client.nix | 86 ++++++++++++++++++++++ .../networking/instant-messengers/jami/default.nix | 6 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 91 insertions(+), 82 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/jami/client-qt.nix create mode 100644 pkgs/applications/networking/instant-messengers/jami/client.nix diff --git a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix b/pkgs/applications/networking/instant-messengers/jami/client-qt.nix deleted file mode 100644 index 7733b05168b61..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ version -, src -, jami-meta -, lib -, stdenv -, pkg-config -, cmake -, networkmanager # for libnm -, python3 -, qttools # for translations -, wrapQtAppsHook -, ffmpeg-jami -, jami-daemon -, libnotify -, qt5compat -, qtbase -, qtdeclarative -, qrencode -, qtmultimedia -, qtnetworkauth -, qtsvg -, qtwebengine -, qtwebchannel -, withWebengine ? true -}: - -stdenv.mkDerivation { - pname = "jami-client-qt"; - inherit version src; - - sourceRoot = "source/client-qt"; - - preConfigure = '' - python gen-resources.py - echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h - ''; - - nativeBuildInputs = [ - wrapQtAppsHook - pkg-config - cmake - python3 - qttools - ]; - - buildInputs = [ - ffmpeg-jami - jami-daemon - libnotify - networkmanager - qtbase - qt5compat - qrencode - qtnetworkauth - qtdeclarative - qtmultimedia - qtsvg - qtwebchannel - ] ++ lib.optionals withWebengine [ - qtwebengine - ]; - - cmakeFlags = [ - "-DRING_BUILD_DIR=${jami-daemon}/include" - "-DRING_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" - ] ++ lib.optionals (!withWebengine) [ - "-DWITH_WEBENGINE=false" - ]; - - qtWrapperArgs = [ - # With wayland the titlebar is not themed and the wmclass is wrong. - "--set-default QT_QPA_PLATFORM xcb" - ]; - - meta = jami-meta // { - description = "The client based on QT" + jami-meta.description; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/jami/client.nix b/pkgs/applications/networking/instant-messengers/jami/client.nix new file mode 100644 index 0000000000000..2ce1aba4af55d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jami/client.nix @@ -0,0 +1,86 @@ +{ version +, src +, jami-meta +, lib +, fetchpatch +, stdenv +, pkg-config +, cmake +, networkmanager # for libnm +, python3 +, qttools # for translations +, wrapQtAppsHook +, ffmpeg-jami +, jami-daemon +, libnotify +, qt5compat +, qtbase +, qtdeclarative +, qrencode +, qtmultimedia +, qtnetworkauth +, qtsvg +, qtwebengine +, qtwebchannel +, withWebengine ? true +}: + +stdenv.mkDerivation { + 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 = '' + echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h + ''; + + nativeBuildInputs = [ + wrapQtAppsHook + pkg-config + cmake + python3 + qttools + ]; + + buildInputs = [ + ffmpeg-jami + jami-daemon + libnotify + networkmanager + qtbase + qt5compat + qrencode + qtnetworkauth + qtdeclarative + qtmultimedia + qtsvg + qtwebchannel + ] ++ lib.optionals withWebengine [ + qtwebengine + ]; + + cmakeFlags = [ + "-DLIBJAMI_INCLUDE_DIR=${jami-daemon}/include/jami" + "-DLIBJAMI_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" + ] ++ lib.optionals (!withWebengine) [ + "-DWITH_WEBENGINE=false" + ]; + + qtWrapperArgs = [ + # With wayland the titlebar is not themed and the wmclass is wrong. + "--set-default QT_QPA_PLATFORM xcb" + ]; + + meta = jami-meta // { + description = "The client based on QT" + jami-meta.description; + }; +} 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; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5086a129337a2..e13521d65d81a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -661,6 +661,7 @@ mapAliases ({ jack2Full = jack2; # moved from top-level 2021-03-14 jami-client-gnome = throw "jami-client-gnome has been removed: abandoned upstream"; # Added 2022-05-15 + jami-client-qt = jami-client; # Added 2022-11-06 jami-libclient = throw "jami-libclient has been removed: moved into jami-qt"; # Added 2022-07-29 jamomacore = throw "jamomacore has been removed: abandoned upstream"; # Added 2020-11-21 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ab3efcda7393..e7bb66e6c3f5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38014,7 +38014,7 @@ with pkgs; udev = systemdMinimal; jack = libjack2; }; - inherit (jami) jami-daemon jami-client-qt; + inherit (jami) jami-daemon jami-client; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; -- cgit 1.4.1