nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 20:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

jami: 20220726.1515.da8d1da -> 20220825.0828.c10f01f

Browse Source
This commit is contained in:
linsui 2022-10-27 22:18:53 +08:00
parent 829669d197
commit c765c2d079
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@
, qtsvg , qtsvg
, qtwebengine , qtwebengine
, qtwebchannel , qtwebchannel
, withWebengine ? false , withWebengine ? true
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -32,7 +32,7 @@ stdenv.mkDerivation {
preConfigure = '' preConfigure = ''
python gen-resources.py python gen-resources.py
echo 'const char VERSION_STRING[] = "${version}";' > src/version.h echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h
''; '';
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -3,7 +3,7 @@
, callPackage , callPackage
, fetchFromGitHub , fetchFromGitHub
, fetchzip , fetchzip
, ffmpeg_4 , ffmpeg
, pjsip , pjsip
, opendht , opendht
, jack , jack
@ -12,11 +12,11 @@
}: }:
let let
version = "20220726.1515.da8d1da"; version = "20220825.0828.c10f01f";
src = fetchzip { src = fetchzip {
url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz";
hash = "sha256-yK+xo+YpNYmmWyNAE31hiL6HLvDdEFkm8FO6LQmPCL0="; hash = "sha256-axQYU7+kOFE9SnI8fR4F6NFvD9ITZ85UJhg5OVniSlg=";
stripRoot = false; stripRoot = false;
postFetch = '' postFetch = ''
@ -40,7 +40,12 @@ let
readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file));
in in
rec { rec {
ffmpeg-jami = ffmpeg_4.overrideAttrs (old: ffmpeg-jami = (ffmpeg.override rec {
version = "5.0.1";
branch = version;
sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY=";
doCheck = false;
}).overrideAttrs (old:
let let
patch-src = src + "/daemon/contrib/src/ffmpeg/"; patch-src = src + "/daemon/contrib/src/ffmpeg/";
in in
@ -51,10 +56,6 @@ rec {
++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux)
++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86); ++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86);
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
meta = old.meta // {
# undefined reference to `ff_nlmeans_init_aarch64'
broken = stdenv.isAarch64;
};
}); });
pjsip-jami = pjsip.overrideAttrs (old: pjsip-jami = pjsip.overrideAttrs (old:
@ -62,23 +63,19 @@ rec {
patch-src = src + "/daemon/contrib/src/pjproject/"; patch-src = src + "/daemon/contrib/src/pjproject/";
in in
rec { rec {
version = "4af5d666d18837abaac94c8ec6bfc84984dcf1e2"; version = "513a3f14c44b2c2652f9219ec20dea64b236b713";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "savoirfairelinux"; owner = "savoirfairelinux";
repo = "pjproject"; repo = "pjproject";
rev = version; rev = version;
sha256 = "sha256-ENRfQh/HCXqInTV0tu8tGQO7+vTbST6XXpptERXMACE="; sha256 = "sha256-93AlJGMnlzJMrJquelpHQQKjhEgfpTFXTMqkBnm87u8=";
}; };
patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));
configureFlags = (readLinesToList ./config/pjsip_args_common) configureFlags = (readLinesToList ./config/pjsip_args_common)
++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux);
meta = {
knownVulnerabilities = [ "CVE-2022-39269" "CVE-2022-39244" ];
} // old.meta;
}); });
opendht-jami = opendht.override { opendht-jami = opendht.override {

4
pkgs/applications/networking/instant-messengers/jami/update.sh
View File

@ -13,7 +13,7 @@ echo "Latest version: ${version}"
update-source-version jami-daemon "$version" --file=$jami_dir/default.nix update-source-version jami-daemon "$version" --file=$jami_dir/default.nix
src=$(nix-build --no-out-link -A jami-libclient.src) src=$(nix-build --no-out-link -A jami-daemon.src)
config_dir="$jami_dir/config" config_dir="$jami_dir/config"
mkdir -p $config_dir mkdir -p $config_dir
@ -47,7 +47,7 @@ echo "${pjsip_patches}" > "$config_dir/pjsip_patches"
# Update pjsip version # Update pjsip version
pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak) pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak)
update-source-version jami-daemon.pjsip "$pjsip_version" --file=pkgs/applications/networking/instant-messengers/jami/daemon.nix update-source-version jami.pjsip-jami "$pjsip_version" --file=$jami_dir/default.nix
pjsip_rules="${src}/daemon/contrib/src/pjproject/rules.mak" pjsip_rules="${src}/daemon/contrib/src/pjproject/rules.mak"