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

jami: 20220825.0828.c10f01f -> 20221031.1308.130cc26

Browse Source
This commit is contained in:
linsui 2022-11-18 12:07:19 +08:00
parent a14e29ab81
commit 6b237a4a06
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/networking/instant-messengers/jami/client-qt.nix → pkgs/applications/networking/instant-messengers/jami/client.nix
View File

@ -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"
];

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

@ -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;
};
}

1
pkgs/top-level/aliases.nix
View File

@ -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

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };