From 302bf6acc5e4defbf72c2443f64cc4f6cd31631c Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Wed, 16 Apr 2025 22:27:34 +0800 Subject: [PATCH 1/2] pjsip: 2.14.1 -> 2.15.1 --- pkgs/by-name/pj/pjsip/fix-aarch64.patch | 13 ------------- pkgs/by-name/pj/pjsip/package.nix | 11 ++++++----- 2 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 pkgs/by-name/pj/pjsip/fix-aarch64.patch diff --git a/pkgs/by-name/pj/pjsip/fix-aarch64.patch b/pkgs/by-name/pj/pjsip/fix-aarch64.patch deleted file mode 100644 index 1680bde707ca..000000000000 --- a/pkgs/by-name/pj/pjsip/fix-aarch64.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/aconfigure -+++ b/aconfigure -@@ -9174,6 +9174,10 @@ - ac_webrtc_instset=neon - ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" - ;; -+ arm64*|aarch64*) -+ ac_webrtc_instset=neon -+ ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" -+ ;; - *) - ac_webrtc_instset=sse2 - ;; diff --git a/pkgs/by-name/pj/pjsip/package.nix b/pkgs/by-name/pj/pjsip/package.nix index 5d0e9484c838..53219b38c98e 100644 --- a/pkgs/by-name/pj/pjsip/package.nix +++ b/pkgs/by-name/pj/pjsip/package.nix @@ -13,17 +13,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "pjsip"; - version = "2.14.1"; + version = "2.15.1"; src = fetchFromGitHub { owner = "pjsip"; repo = "pjproject"; tag = finalAttrs.version; - hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY="; + hash = "sha256-9WzOIKWGy71OMzaPOp1P8/pvhHio2rDJOkH1VaNItjU="; }; - patches = [ ./fix-aarch64.patch ]; - postPatch = '' substituteInPlace \ pjsip-apps/src/py_pjsua/setup.py \ @@ -48,7 +46,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; env = - lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } + { + NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; + } + // lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; }; From 6c8394c3dc8c2b672177f2ea58fccfa4101af689 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Wed, 16 Apr 2025 22:29:15 +0800 Subject: [PATCH 2/2] jami: 20241031.0 -> 20250523.0 --- .../instant-messengers/jami/default.nix | 44 ++++++++----------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index ba1c6d69c01c..18555d053545 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -68,31 +68,32 @@ stdenv.mkDerivation rec { pname = "jami"; - version = "20241031.0"; + version = "20250523.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-LKezdzM+ltUSgW4GmTXICyufx9mI1AVbdEcwSp6tmao="; + hash = "sha256-uc2IcSAaCTkTMwjhgMRVdWsStLkOO5dPU2Hx+cYUUL0="; fetchSubmodules = true; }; - pjsip-jami = pjsip.overrideAttrs (old: rec { - version = "8fc165b833eea6e3c88d67a541385424b129fd3f"; + pjsip-jami = pjsip.overrideAttrs (old: { + version = "sfl-2.15-unstable-2025-02-24"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; - rev = version; - hash = "sha256-uA6ZJYUgAu3cK4CKCGtqaI0KPM/0szExPS2pCOflz5A="; + rev = "37130c943d59f25a71935803ea2d84515074a237"; + hash = "sha256-7gAiriuooqqF38oajAuD/Lj5trn/9VMkCGOumcV45NA="; }; configureFlags = [ "--disable-sound" "--enable-video" "--enable-ext-sound" + "--disable-android-mediacodec" "--disable-speex-aec" "--disable-g711-codec" "--disable-l16-codec" @@ -115,30 +116,21 @@ stdenv.mkDerivation rec { buildInputs = old.buildInputs ++ [ gnutls ]; }); - opendht-jami = - (opendht.overrideAttrs { - src = fetchFromGitHub { - owner = "savoirfairelinux"; - repo = "opendht"; - rev = "074e05cc3254d5d73b0d96ee772a6e01bb3113e5"; - hash = "sha256-WuaURlC7eDDxvnM3YuyU9CNrwnE4WBQUIEw3z/0zjN8="; - }; - }).override - { - enableProxyServerAndClient = true; - enablePushNotifications = true; - }; + opendht-jami = opendht.override { + enableProxyServerAndClient = true; + enablePushNotifications = true; + }; dhtnet = stdenv.mkDerivation { pname = "dhtnet"; - version = "unstable-2024-07-22"; + version = "unstable-2025-03-19"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "dhtnet"; - rev = "8cd00200669fa5b7632faa447ba206c3847e2879"; - hash = "sha256-SGidaCi5z7hO0ePJIZIkcWAkb+cKsZTdksVS7ldpjME="; + rev = "7e7359ff5dadd9aaf6d341486f3ee41029f645e1"; + hash = "sha256-sT7OgYUBnO+HfIeCaR3lmoFJ9qE1Y5TEK1/KHzhvK7M="; }; postPatch = '' @@ -236,18 +228,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; }; - qwindowkit = fetchFromGitHub { + qwindowkit-src = fetchFromGitHub { owner = "stdware"; repo = "qwindowkit"; - rev = "79b1f3110754f9c21af2d7dacbd07b1a9dbaf6ef"; - hash = "sha256-iZfmv3ADVjHf47HPK/FdrfeAzrXbxbjH3H5MFVg/ZWE="; + rev = "758b00cb6c2d924be3a1ea137ec366dc33a5132d"; + hash = "sha256-qpVsF4gUX2noG9nKgjNP7FCEe59okZtDA8R/aZOef7Q="; fetchSubmodules = true; }; postPatch = '' sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake sed -i -e 's/if(DISTRO_NEEDS_QMSETUP_PATCH)/if(TRUE)/' CMakeLists.txt - cp -R --no-preserve=mode,ownership ${qwindowkit} qwindowkit + cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit ''; preConfigure = ''