diff --git a/pkgs/applications/networking/instant-messengers/linphone/README.md b/pkgs/applications/networking/instant-messengers/linphone/README.md new file mode 100644 index 000000000000..5828ca223747 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/README.md @@ -0,0 +1,41 @@ +# Linphone + +Linphone is a SIP softphone application developed by Belledonne Communications. + +The main application is located in the [`linphone-desktop`](https://gitlab.linphone.org/BC/public/linphone-desktop) repository, and depends on many bespoke libraries, as well as third-party libraries with custom patches. +This scope provides all libraries and patches needed for Linphone to build. + +BC-developed libraries are housed within the [`linphone-sdk`](https://gitlab.linphone.org/BC/public/linphone-sdk) monorepo. +Current stable versions of the monorepo utilize git submodules to link the respective package repos, but BC has since integrated all of their libraries into the monorepo proper, which is why we're already using a single source for the entire repo. +An auxiliary function `mkLinphoneDerivation` is provided in this scope, to streamline building libraries from that repository. + +Other third-party libraries for which BC has provided custom patches, and are not included in the monorepo, are prefixed with `bc-`. + +All libraries and packages are exposed in nixpkgs under the `linphonePackage` scope via `pkgs/all-packages.nix`. + +## Updating + +Updating is done in 3 steps: + +1. Update the main Linphone application in the derivation directly +2. Update all libraries derived from the `linphone-sdk` monorepo, by updating the monorepo version and hash in `./default.nix` +3. Update all custom versions of third-party libraries individually (those prefixed with `bc-`) +4. Verify that the build is working by building (and running) `linphonePackages.linphone-desktop`. + +> [!TIP] +> +> When testing, run the app with `./result/bin/linphone --verbose` to get useful logs in `stdout`. + +## Adding new libraries + +To add a new package to this scope, simply add a new subdirectory containing a `default.nix` file with the appropriate package name. The scope automatically picks up any directories and adds an according toplevel package. + +If the package you are adding is contained within the `linphone-sdk` monorepo, it makes sense to use the `mkLinphoneDerivation` function to streamline the build process. + +If the package you are adding is a third-party libary with custom patches from BC, it should be prefixed with `bc-` for easy recognizability, so e.g. if BC were to patch `ffmpeg`, you would call the package `bc-ffmpeg`. + +## Notes for the future + +As mentioned before, currently most libraries within `linphone-sdk` are simply git submodules, but in the future, they will be properly integrated into the monorepo (this is already the case for their main branch). + +Also, currently the build relies on Qt5, but starting with Linphone 6.0.0, which as of 2025-09-20 is in its RC phase, the build will involve Qt6. diff --git a/pkgs/by-name/bc/bc-decaf/package.nix b/pkgs/applications/networking/instant-messengers/linphone/bc-decaf/default.nix similarity index 57% rename from pkgs/by-name/bc/bc-decaf/package.nix rename to pkgs/applications/networking/instant-messengers/linphone/bc-decaf/default.nix index 30535e1206c6..b873fc0aea1a 100644 --- a/pkgs/by-name/bc/bc-decaf/package.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/bc-decaf/default.nix @@ -5,10 +5,10 @@ python3, stdenv, }: - stdenv.mkDerivation { pname = "bc-decaf"; - version = "unstable-2022-07-20"; + # version retrieved from `HISTORY.txt` + version = "1.0.2-unstable-2025-06-25"; nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -20,21 +20,24 @@ stdenv.mkDerivation { group = "BC"; owner = "public/external"; repo = "decaf"; - rev = "876ddb4d465c94f97beba1be450e8538d866cc5d"; - sha256 = "sha256-QFOAgLiPbG2ZdwKoCOrVD5/sPq9IH4rtAWnnk/rZWcs="; + rev = "e5cc6240690d3ffdfcbdb1e4e851954b789cd5d9"; + sha256 = "sha256-4oZtpdelyKbd2k4LAhtsLkL5Y84C1Qb02fpVywYorr8="; }; # Do not build static libraries and do not enable -Werror cmakeFlags = [ "-DENABLE_STATIC=NO" + "-DBUILD_SHARED_LIBS=ON" "-DENABLE_STRICT=NO" ]; - meta = with lib; { + meta = { description = "Elliptic curve library supporting Ed448-Goldilocks and Curve25519. Belledonne Communications' fork for Linphone"; - homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; - license = licenses.mit; - maintainers = with maintainers; [ thibaultlemaire ]; - platforms = platforms.linux; + homepage = "https://gitlab.linphone.org/BC/public/external/decaf"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + naxdy + ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/default.nix new file mode 100644 index 000000000000..69c8fc8fcf8d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/default.nix @@ -0,0 +1,59 @@ +{ + cmake, + fetchFromGitLab, + lib, + stdenv, + + # tests + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "bc-ispell"; + # version retrieved from `CHANGES` + version = "3.4.02-unstable-2025-05-05"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + group = "BC"; + owner = "public/external"; + repo = "ispell"; + rev = "05574fe160222c3d0b6283c1433c9b087271fad1"; + sha256 = "sha256-YoRLiMjk2BxoI27xc2nzucxfHV9UbouFRSECb3RdHGo="; + }; + + patches = [ + # linphone has custom find modules that look for this package, + # but they do not work in nix, so we need to patch this library to + # install regular cmake config files + ./install-config-files.patch + ]; + + cmakeFlags = [ + "-DENABLE_STATIC=NO" + "-DBUILD_SHARED_LIBS=ON" + ]; + + nativeBuildInputs = [ cmake ]; + + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ + "ISpell" + ]; + }; + }; + + meta = { + description = "Interactive spelling checker"; + homepage = "https://gitlab.linphone.org/BC/public/external/ispell"; + platforms = lib.platforms.all; + # NOTE: ISpell itself does not explicitly provide a license. From its + # 'Contributors' file, it can be deduced that it is distributed under + # "some" open source license, but the details are not clear. + license = lib.licenses.free; + maintainers = with lib.maintainers; [ + naxdy + ]; + }; +}) diff --git a/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/install-config-files.patch b/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/install-config-files.patch new file mode 100644 index 000000000000..c538fd617c09 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/install-config-files.patch @@ -0,0 +1,90 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6edcc88..6f5601d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,11 +47,62 @@ set(ISPELL_SOURCES + xgets.c + ) + ++set(ISPELL_HEADERS ++ config.h ++ defhash.h ++ exp_table.h ++ fields.h ++ ispell.h ++ libispell.h ++ local.h ++ msgs.h ++ proto.h ++ version.h ++) ++ + add_library(${ISPELL_TARGET_NAME} SHARED ${ISPELL_SOURCES}) + ++install( ++ FILES ++ ${ISPELL_HEADERS} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++) ++ ++install(TARGETS ${ISPELL_TARGET_NAME} ++ EXPORT ${ISPELL_TARGET_NAME}Targets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++ + install(TARGETS ${ISPELL_TARGET_NAME} + EXPORT ${ISPELL_TARGET_NAME}LibraryDepends + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++ ++install( ++ EXPORT ${ISPELL_TARGET_NAME}Targets ++ FILE ${ISPELL_TARGET_NAME}Targets.cmake ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/${ISPELL_TARGET_NAME}/cmake" ++ NAMESPACE ${ISPELL_TARGET_NAME}:: ++) ++ ++install( ++ EXPORT ${ISPELL_TARGET_NAME}LibraryDepends ++ FILE ${ISPELL_TARGET_NAME}LibraryDepends.cmake ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/${ISPELL_TARGET_NAME}/cmake" ++ NAMESPACE ${ISPELL_TARGET_NAME}:: ++) ++ ++configure_package_config_file( ++ ${ISPELL_TARGET_NAME}Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/${ISPELL_TARGET_NAME}Config.cmake" ++ INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/${ISPELL_TARGET_NAME}/cmake" ++) ++ ++install( ++ FILES "${CMAKE_CURRENT_BINARY_DIR}/${ISPELL_TARGET_NAME}Config.cmake" ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/${ISPELL_TARGET_NAME}/cmake" ++) +diff --git a/ISpellConfig.cmake.in b/ISpellConfig.cmake.in +index 052194b..cb71737 100644 +--- a/ISpellConfig.cmake.in ++++ b/ISpellConfig.cmake.in +@@ -6,13 +6,13 @@ + + @PACKAGE_INIT@ + +-include("${CMAKE_CURRENT_LIST_DIR}/@ISPELL_TARGET_NAME@LibraryDepends.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/ISpellLibraryDepends.cmake") + +-set(ISPELL_LIBRARIES "@ISPELL_TARGET_NAME@") +-get_target_property(ISPELL_INCLUDE_DIRS "@ISPELL_TARGET_NAME@" INTERFACE_INCLUDE_DIRECTORIES) ++set(ISPELL_LIBRARIES "ISpell") ++get_target_property(ISPELL_INCLUDE_DIRS "ISpell::ISpell" INTERFACE_INCLUDE_DIRECTORIES) + + if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.18.0) +- add_library(@ISpell_TARGET_NAME@::@ISpell_TARGET_NAME@ ALIAS @ISpell_TARGET_NAME@) ++ add_library(ISpell ALIAS ISpell::ISpell) + endif() + +-check_required_components(@ISpell_TARGET_NAME@) ++check_required_components(ISpell) diff --git a/pkgs/development/libraries/soci/bc-soci.nix b/pkgs/applications/networking/instant-messengers/linphone/bc-soci/default.nix similarity index 73% rename from pkgs/development/libraries/soci/bc-soci.nix rename to pkgs/applications/networking/instant-messengers/linphone/bc-soci/default.nix index 1d8d4bc1e46a..cbac097deeda 100644 --- a/pkgs/development/libraries/soci/bc-soci.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/bc-soci/default.nix @@ -10,15 +10,16 @@ stdenv.mkDerivation { pname = "bc-soci"; - version = "linphone-4.4.1"; + # version retrieved from `CHANGELOG.md` + version = "3.2.3-unstable-2025-05-05"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; group = "BC"; owner = "public/external"; repo = "soci"; - rev = "bc8ce0c5628dd48eca6ef5ce0a0a2f52547d88b6"; - sha256 = "sha256-qo26aYp/G2C6UkGA1qkHQwTKD5go7TQ9JWxb9xtbe6M="; + rev = "3a9c79088212941d0175c22cd2da8fe1bdd639df"; + sha256 = "sha256-7aSTFD4yk1i6c9cEGqdo/eJtuqoOUZUTJlZijgjuYpM="; }; patches = [ @@ -44,11 +45,13 @@ stdenv.mkDerivation { boost ]; - meta = with lib; { + meta = { description = "Database access library for C++. Belledonne Communications' fork for Linphone"; homepage = "https://gitlab.linphone.org/BC/public/external/soci"; - license = licenses.boost; - platforms = platforms.all; - maintainers = with maintainers; [ thibaultlemaire ]; + license = lib.licenses.boost; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + naxdy + ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/bctoolbox/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bctoolbox/default.nix new file mode 100644 index 000000000000..55830150633f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/bctoolbox/default.nix @@ -0,0 +1,50 @@ +{ + bcunit, + bc-decaf, + mkLinphoneDerivation, + openssl, + lib, + + # tests + testers, +}: +mkLinphoneDerivation (finalAttrs: { + pname = "bctoolbox"; + + propagatedBuildInputs = [ + bcunit + bc-decaf + openssl + ]; + + cmakeFlags = [ + "-DENABLE_STRICT=NO" + + # mbedtils does not build + "-DENABLE_MBEDTLS=NO" + "-DENABLE_OPENSSL=YES" + ]; + + strictDeps = true; + + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ + "BCToolbox" + ]; + }; + }; + + meta = { + description = "Utilities library for Linphone"; + mainProgram = "bctoolbox_tester"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + jluttine + naxdy + raskin + ]; + }; +}) diff --git a/pkgs/applications/networking/instant-messengers/linphone/bcunit/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bcunit/default.nix new file mode 100644 index 000000000000..52bd8502d139 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/bcunit/default.nix @@ -0,0 +1,17 @@ +{ + mkLinphoneDerivation, + lib, +}: +mkLinphoneDerivation { + pname = "bcunit"; + + meta = { + description = "Fork of the defunct project CUnit, a unit testing framework"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ + jluttine + naxdy + raskin + ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/belcard/default.nix b/pkgs/applications/networking/instant-messengers/linphone/belcard/default.nix new file mode 100644 index 000000000000..888f5c53c34a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/belcard/default.nix @@ -0,0 +1,35 @@ +{ + bctoolbox, + belr, + lib, + mkLinphoneDerivation, + + # tests + testers, +}: +mkLinphoneDerivation (finalAttrs: { + pname = "belcard"; + + propagatedBuildInputs = [ + bctoolbox + belr + ]; + + cmakeFlags = [ + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; + + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ + "BelCard" + ]; + }; + }; + + meta = { + description = "C++ library to manipulate VCard standard format. Part of the Linphone project"; + license = lib.licenses.gpl3Only; + }; +}) diff --git a/pkgs/by-name/be/belle-sip/package.nix b/pkgs/applications/networking/instant-messengers/linphone/belle-sip/default.nix similarity index 53% rename from pkgs/by-name/be/belle-sip/package.nix rename to pkgs/applications/networking/instant-messengers/linphone/belle-sip/default.nix index 4efd5878e5a5..41890249a381 100644 --- a/pkgs/by-name/be/belle-sip/package.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/belle-sip/default.nix @@ -1,34 +1,19 @@ { bctoolbox, belr, - cmake, - fetchFromGitLab, lib, libantlr3c, - mbedtls_2, stdenv, zlib, + python3, + mkLinphoneDerivation, }: - -stdenv.mkDerivation rec { +mkLinphoneDerivation { pname = "belle-sip"; - version = "5.2.98"; - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "belle-sip"; - tag = version; - hash = "sha256-PZnAB+LOlwkiJO0ICqYqn0TgqQY2KdUbgGJRFSzGxdE="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ zlib ]; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + nativeBuildInputs = [ + python3 + ]; env.NIX_CFLAGS_COMPILE = toString ( [ @@ -45,17 +30,14 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libantlr3c - mbedtls_2 bctoolbox belr + zlib ]; - meta = with lib; { - homepage = "https://gitlab.linphone.org/BC/public/belle-sip"; + meta = { description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers. Part of the Linphone project"; mainProgram = "belle_sip_tester"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; + license = lib.licenses.gpl3Only; }; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/belr/default.nix b/pkgs/applications/networking/instant-messengers/linphone/belr/default.nix new file mode 100644 index 000000000000..6cac18c9c103 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/belr/default.nix @@ -0,0 +1,17 @@ +{ + bctoolbox, + lib, + mkLinphoneDerivation, +}: +mkLinphoneDerivation { + pname = "belr"; + + buildInputs = [ + bctoolbox + ]; + + meta = { + description = "Belledonne Communications' language recognition library (a SIP parsing library). Part of the Linphone project"; + license = lib.licenses.gpl3Only; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/bzrtp/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bzrtp/default.nix new file mode 100644 index 000000000000..dca76746222d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/bzrtp/default.nix @@ -0,0 +1,24 @@ +{ + bctoolbox, + sqlite, + lib, + mkLinphoneDerivation, +}: +mkLinphoneDerivation { + pname = "bzrtp"; + + buildInputs = [ + bctoolbox + sqlite + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=stringop-overflow" + ]; + + meta = { + description = "Opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project"; + license = lib.licenses.gpl3Only; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index da15ef2657a7..0806bb93c17e 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,144 +1,20 @@ { - bctoolbox, - belcard, - belle-sip, - belr, - cmake, - fetchFromGitLab, + generateSplicesForMkScope, + makeScopeWithSplicing', lib, - liblinphone, - mediastreamer, - mediastreamer-openh264, - minizip-ng, - mkDerivation, - qtgraphicaleffects, - qtmultimedia, - qtquickcontrols2, - qttools, }: +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "linphonePackages"; + extra = self: { + mkLinphoneDerivation = self.mk-linphone-derivation; -# How to update Linphone? (The Qt desktop app) -# -# Belledonne Communications (BC), the company making Linphone, has split the -# project into several sub-projects that they maintain, plus some third-party -# dependencies that they also extend with commits of their own, specific to -# Linphone and not (yet?) upstreamed. -# -# All of this is organised in a Software Development Kit (SDK) meta-repository -# with git submodules to pin all those repositories into a coherent whole. -# -# The Linphone Qt desktop app uses this SDK as submodule as well. -# -# So, in order to update the desktop app to a new release, one has to follow -# the submodule chain and update the corresponding derivations here, in nixpkgs, -# with the corresponding version number (or commit hash) - -mkDerivation rec { - pname = "linphone-desktop"; - version = "5.1.2"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "linphone-desktop"; - rev = version; - hash = "sha256-Pu2tGKe3C1uR4lzXkC5sJFu8iJBqF76UfWJXYjPwBkc="; - }; - - patches = [ - ./do-not-build-linphone-sdk.patch - ./remove-bc_compute_full_version-usage.patch - ./no-store-path-in-autostart.patch - ./reset-output-dirs.patch - ]; - - # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21 - postPatch = '' - echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake - substituteInPlace linphone-app/src/app/AppController.cpp \ - --replace "APPLICATION_SEMVER" "\"${version}\"" - substituteInPlace CMakeLists.txt \ - --subst-var out - ''; - - # TODO: After linphone-desktop and liblinphone split into separate packages, - # there might be some build inputs here that aren't needed for - # linphone-desktop. - buildInputs = [ - # Made by BC - bctoolbox - belcard - belle-sip - belr - liblinphone - mediastreamer - mediastreamer-openh264 - - minizip-ng - qtgraphicaleffects - qtmultimedia - qtquickcontrols2 - ]; - - nativeBuildInputs = [ - cmake - qttools - ]; - - cmakeFlags = [ - "-DMINIZIP_INCLUDE_DIRS=${minizip-ng}/include" - "-DMINIZIP_LIBRARIES=minizip" - - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - - # Requires EQt5Keychain - "-DENABLE_QT_KEYCHAIN=OFF" - - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - preInstall = '' - mkdir -p $out/share/linphone - mkdir -p $out/share/sounds/linphone - ''; - - # In order to find mediastreamer plugins, mediastreamer package was patched to - # support an environment variable pointing to the plugin directory. Set that - # environment variable by wrapping the Linphone executable. - # - # Also, some grammar files needed to be copied too from some dependencies. I - # suppose if one define a dependency in such a way that its share directory is - # found, then this copying would be unnecessary. These missing grammar files - # were discovered when linphone crashed at startup and it was run with - # --verbose flag. Instead of actually copying these files, create symlinks. - # - # It is quite likely that there are some other files still missing and - # Linphone will randomly crash when it tries to access those files. Then, - # those just need to be copied manually below. - postInstall = '' - mkdir -p $out/lib/mediastreamer/plugins - ln -s ${mediastreamer-openh264}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ - ln -s ${mediastreamer}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ - - mkdir -p $out/share/belr/grammars - ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ - ln -s ${liblinphone}/share/sounds/linphone/* $out/share/sounds/linphone/ - ln -s ${belle-sip}/share/belr/grammars/* $out/share/belr/grammars/ - - wrapProgram $out/bin/linphone \ - --set MEDIASTREAMER_PLUGINS_DIR $out/lib/mediastreamer/plugins - ''; - - meta = with lib; { - homepage = "https://www.linphone.org/"; - description = "Open source SIP phone for voice/video calls and instant messaging"; - mainProgram = "linphone"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ jluttine ]; + linphoneSdkVersion = "5.4.43"; + linphoneSdkHash = "sha256-lv2phU2qF51OIejzjgaBUo9NIdDv4bbK+bpY37Gnr8U="; }; + f = + self: + let + packages = lib.filterAttrs (name: value: value == "directory") (builtins.readDir ./.); + in + lib.mapAttrs (name: value: self.callPackage ./${name} { }) packages; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch b/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch deleted file mode 100644 index f93f031bf690..000000000000 --- a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch +++ /dev/null @@ -1,157 +0,0 @@ -From e6a9992461f368d08d1ad63ffe454714ec0c59ce Mon Sep 17 00:00:00 2001 -From: Lorenz Brun -Date: Fri, 28 Jan 2022 02:36:01 +0100 -Subject: [PATCH] Remove Linphone SDK build - ---- - CMakeLists.txt | 100 +----------------- - .../cmake_builder/additional_steps.cmake | 9 -- - 2 files changed, 5 insertions(+), 104 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5a4ab5..3afcd88 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -194,7 +194,6 @@ list(APPEND APP_OPTIONS "-DQTKEYCHAIN_TARGET_NAME=${QTKEYCHAIN_TARGET_NAME}") - - list(APPEND APP_OPTIONS "-DENABLE_QT_GL=${ENABLE_VIDEO}")#Activate on video - --include(ExternalProject) - set(PROJECT_BUILD_COMMAND "") - if(CMAKE_BUILD_PARALLEL_LEVEL) - list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") -@@ -237,41 +236,8 @@ if(ENABLE_BUILD_APP_PLUGINS) - endif() - endif() - --if(NOT LINPHONE_QT_ONLY) --#add_subdirectory(external/qtkeychain) -- if(ENABLE_QT_KEYCHAIN) -- ExternalProject_Add(app-qtkeychain PREFIX "${CMAKE_BINARY_DIR}/qtkeychain" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/qtkeychain" -- INSTALL_DIR "${QTKEYCHAIN_OUTPUT_DIR}" -- BINARY_DIR "${SDK_BUILD_DIR}/qtkeychain" -- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${QTKEYCHAIN_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} -- BUILD_ALWAYS NO #${DO_BUILD} -- ) -- endif() -- ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" -- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" -- STAMP_DIR "${SDK_BUILD_DIR}/stamp" -- BINARY_DIR "${SDK_BUILD_DIR}" -- STEP_TARGETS build -- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} -- BUILD_ALWAYS NO #${DO_BUILD} -- ) -- ExternalProject_Add_Step(sdk force_build -- COMMENT "Forcing build for 'sdk'" -- DEPENDEES configure -- DEPENDERS build -- ALWAYS 1 -- ) --endif() - include(FindPkgConfig) - --set(APP_DEPENDS sdk)# Used if NOT LINPHONE_QT_ONLY - if(ENABLE_QT_KEYCHAIN) - list(APPEND APP_DEPENDS app-qtkeychain) - endif() -@@ -289,65 +255,9 @@ find_package(Mediastreamer2 CONFIG QUIET) - find_package(ortp CONFIG QUIET) - find_package(${QTKEYCHAIN_TARGET_NAME} CONFIG QUIET) - --if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) -- OR ( ENABLE_QT_KEYCHAIN AND NOT(${QTKEYCHAIN_TARGET_NAME}_FOUND) ) -- OR FORCE_APP_EXTERNAL_PROJECTS --) -- message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") -- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" -- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" -- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" -- DEPENDS ${APP_DEPENDS} -- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} -- # ${APP_OPTIONS} -- BUILD_ALWAYS ON -- ) -- if( ENABLE_BUILD_APP_PLUGINS) -- ExternalProject_Add(app-plugins PREFIX "${CMAKE_BINARY_DIR}/plugins-app" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/plugins" -- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" -- BINARY_DIR "${CMAKE_BINARY_DIR}/plugins-app" -- DEPENDS linphone-qt -- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} -- ) -- endif() -- install(CODE "message(STATUS \"Running install\")") -- set(AUTO_REGENERATION auto_regeneration) -- if( ENABLE_BUILD_APP_PLUGINS) -- add_custom_target(${AUTO_REGENERATION} ALL -- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS app-plugins) -- else() -- add_custom_target(${AUTO_REGENERATION} ALL -- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS linphone-qt) -- endif() --else() -- message("Adding Linphone Desktop in an IDE-friendly state") -- set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") -- add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) -- if(NOT LINPHONE_QT_ONLY) -- add_dependencies(app-library ${APP_DEPENDS}) -- endif() -- if( ENABLE_BUILD_APP_PLUGINS) -- add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app") -- endif() -+message("Adding Linphone Desktop in an IDE-friendly state") -+set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") -+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) -+if( ENABLE_BUILD_APP_PLUGINS) -+ add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app") - endif() --ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" -- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" -- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" -- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} --# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} -- EXCLUDE_FROM_ALL ON -- #BUILD_ALWAYS ON --) -diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake -index 7f7fd57..a69a04e 100644 ---- a/linphone-app/cmake_builder/additional_steps.cmake -+++ b/linphone-app/cmake_builder/additional_steps.cmake -@@ -54,14 +54,5 @@ if (ENABLE_PACKAGING) - linphone_builder_apply_flags() - linphone_builder_set_ep_directories(linphone_package) - linphone_builder_expand_external_project_vars() -- ExternalProject_Add(TARGET_linphone_package -- DEPENDS TARGET_linphone_builder -- TMP_DIR ${ep_tmp} -- BINARY_DIR ${ep_build} -- SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/linphone_package" -- DOWNLOAD_COMMAND "" -- CMAKE_GENERATOR ${CMAKE_GENERATOR} -- CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DLINPHONE_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY} -- ) - endif () - endif () --- -2.39.3 (Apple Git-145) - diff --git a/pkgs/by-name/li/liblinphone/package.nix b/pkgs/applications/networking/instant-messengers/linphone/liblinphone/default.nix similarity index 55% rename from pkgs/by-name/li/liblinphone/package.nix rename to pkgs/applications/networking/instant-messengers/linphone/liblinphone/default.nix index e3eebef53ba3..41c7c5239a35 100644 --- a/pkgs/by-name/li/liblinphone/package.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/liblinphone/default.nix @@ -3,49 +3,27 @@ bc-soci, belcard, belle-sip, - cmake, doxygen, - fetchFromGitLab, jsoncpp, libxml2, lime, - mediastreamer, + mediastreamer2, python3, sqlite, - stdenv, xercesc, zxing-cpp, + mkLinphoneDerivation, }: - -stdenv.mkDerivation rec { +mkLinphoneDerivation { pname = "liblinphone"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "liblinphone"; - rev = version; - hash = "sha256-kQZePMa7MTaSJLEObM8khfSFYLqhlgTcVyKfTPLwKYU="; - }; - - patches = [ - # zxing-cpp 2.0+ requires C++ 17 - # Manual backport as upstream ran formatters in the meantime - ./backport-cpp17.patch - ]; - - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace "jsoncpp_object" "jsoncpp" \ - --replace "jsoncpp_static" "jsoncpp" - ''; cmakeFlags = [ - "-DENABLE_STATIC=NO" # Do not build static libraries "-DENABLE_UNIT_TESTS=NO" # Do not build test executables "-DENABLE_STRICT=NO" # Do not build with -Werror + + # normally set by a cmake module, but + # we need to disable it to prevent downstream link errors + "-DJsonCPP_TARGET=jsoncpp" ]; buildInputs = [ @@ -53,27 +31,39 @@ stdenv.mkDerivation rec { belcard belle-sip lime - mediastreamer + mediastreamer2 # Vendored by BC bc-soci - jsoncpp libxml2 sqlite xercesc zxing-cpp ]; + propagatedBuildInputs = [ + jsoncpp + ]; + nativeBuildInputs = [ - cmake doxygen (python3.withPackages (ps: [ ps.pystache ps.six + ps.pyturbojpeg ])) ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail JsonCPP jsoncpp + ''; + + preConfigure = '' + rm cmake/FindJsonCPP.cmake + ''; + strictDeps = true; # Some grammar files needed to be copied too from some dependencies. I suppose @@ -85,11 +75,9 @@ stdenv.mkDerivation rec { ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/ ''; - meta = with lib; { - homepage = "https://www.linphone.org/technical-corner/liblinphone"; + meta = { description = "Library for SIP calls and instant messaging"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ jluttine ]; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/lime/default.nix b/pkgs/applications/networking/instant-messengers/linphone/lime/default.nix new file mode 100644 index 000000000000..19c71d5e7c73 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/lime/default.nix @@ -0,0 +1,31 @@ +{ + bctoolbox, + belle-sip, + lib, + bc-soci, + sqlite, + mkLinphoneDerivation, +}: +mkLinphoneDerivation { + pname = "lime"; + + buildInputs = [ + # Made by BC + bctoolbox + belle-sip + + # Vendored by BC + bc-soci + + sqlite + ]; + + cmakeFlags = [ + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; + + meta = { + description = "End-to-end encryption library for instant messaging. Part of the Linphone project"; + license = lib.licenses.gpl3Only; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/default.nix b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/default.nix new file mode 100644 index 000000000000..5b05b31ed59f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/default.nix @@ -0,0 +1,167 @@ +{ + bc-ispell, + bc-soci, + bctoolbox, + belcard, + belle-sip, + belr, + boost, + cmake, + doxygen, + fetchFromGitLab, + lib, + liblinphone, + libsForQt5, + lime, + mediastreamer2, + minizip-ng, + msopenh264, + python3, + python3Packages, + stdenv, + symlinkJoin, + xercesc, + zxing-cpp, +}: +let + grammars = symlinkJoin { + name = "belr-grammars"; + paths = + let + grammarPackages = [ + belle-sip + belcard + liblinphone + ]; + in + map (e: "${e}/share/belr/grammars") grammarPackages; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "linphone-desktop"; + version = "5.3.0"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = "linphone-desktop"; + rev = finalAttrs.version; + hash = "sha256-SxYI2ZOtA49K2XPoTRPAIziAwC8SRrHMC3NISBFyuH0="; + }; + + patches = [ + ./require-finding-packages.patch + ./remove-bc-versions.patch + ./do-not-override-install-prefix.patch + ./fix-translation-dirs.patch + ./unset-qml-dir.patch + + # .mkv recordings are broken in NixOS and other distros (see + # https://github.com/NixOS/nixpkgs/issues/219551), and simply changing the + # file extension is enough to affect the chosen codec (wav makes more + # sense for audio recordings anyway) + ./record-in-wav-format.patch + ]; + + buildInputs = [ + # Made by BC + bctoolbox + belcard + belle-sip + belr + liblinphone + mediastreamer2 + msopenh264 + lime + bc-soci + bc-ispell + + xercesc + minizip-ng + libsForQt5.qtgraphicaleffects + libsForQt5.qtmultimedia + libsForQt5.qtquickcontrols2 + zxing-cpp + boost + + python3Packages.pystache + python3Packages.six + ]; + + nativeBuildInputs = [ + cmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook + python3 + doxygen + ]; + + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + "-DBUILD_SHARED_LIBS=ON" + "-DMINIZIP_INCLUDE_DIRS=${minizip-ng}/include" + "-DMINIZIP_LIBRARIES=minizip" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + + # Requires EQt5Keychain + "-DENABLE_QT_KEYCHAIN=OFF" + + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DLINPHONEAPP_VERSION=${finalAttrs.version}" + "-DLINPHONE_QT_ONLY=ON" + "-DLINPHONEAPP_INSTALL_PREFIX=${placeholder "out"}" + "-DLINPHONE_QML_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtQmlPrefix}/ui" + + # normally set by the custom find modules, which we have disabled + "-DLibLinphone_TARGET=liblinphone" + "-DLinphoneCxx_TARGET=liblinphone++" + "-DISpell_SOURCE_DIR=${bc-ispell.src}" + ]; + + preConfigure = '' + # custom "find" modules are causing issues during build, + # as they are blinding cmake to nix dependencies + rm -rf linphone-app/cmake + ''; + + preInstall = '' + mkdir -p $out/share/linphone + mkdir -p $out/share/sounds/linphone + mkdir -p $out/share/belr + ''; + + # In order to find mediastreamer plugins, mediastreamer package was patched to + # support an environment variable pointing to the plugin directory. Set that + # environment variable by wrapping the Linphone executable. + # + # It is quite likely that there are some other files still missing and + # Linphone will randomly crash when it tries to access those files. Then, + # those just need to be linked manually below. + postInstall = '' + mkdir -p $out/lib/mediastreamer/plugins + ln -s ${msopenh264}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ + ln -s ${mediastreamer2}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ + ln -s ${grammars} $out/share/belr/grammars + + wrapProgram $out/bin/linphone \ + --unset QML2_IMPORT_PATH \ + --set MEDIASTREAMER_PLUGINS_DIR $out/lib/mediastreamer/plugins + ''; + + meta = { + homepage = "https://www.linphone.org/"; + description = "Open source SIP phone for voice/video calls and instant messaging"; + mainProgram = "linphone"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + jluttine + naxdy + ]; + }; +}) diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/do-not-override-install-prefix.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/do-not-override-install-prefix.patch new file mode 100644 index 000000000000..fced960ba7fb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/do-not-override-install-prefix.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 312df041d..43500be48 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -116,11 +116,6 @@ endif () + #------------------------------------------------------------------------------ + # Prepare gobal CMAKE configuration specific to the current project + +-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +- set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/OUTPUT" CACHE PATH "Default linphone-app installation prefix" FORCE) +- set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE) +-endif() +- + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified") + set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo" FORCE) diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/fix-translation-dirs.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/fix-translation-dirs.patch new file mode 100644 index 000000000000..9d2609d9dd8b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/fix-translation-dirs.patch @@ -0,0 +1,15 @@ +diff --git a/linphone-app/assets/languages/CMakeLists.txt b/linphone-app/assets/languages/CMakeLists.txt +index ffe2b6a5b..12f02bdfe 100644 +--- a/linphone-app/assets/languages/CMakeLists.txt ++++ b/linphone-app/assets/languages/CMakeLists.txt +@@ -32,8 +32,8 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${I18N_FILENAME}" "${I18N_CONTENT}") + + #Files or directories to inspect for translations references + set(TRANSLATION_SOURCES) +-list(APPEND TRANSLATION_SOURCES "${PROJECT_SOURCE_DIR}/src") +-list(APPEND TRANSLATION_SOURCES "${PROJECT_SOURCE_DIR}/ui") ++list(APPEND TRANSLATION_SOURCES "${PROJECT_SOURCE_DIR}/linphone-app/src") ++list(APPEND TRANSLATION_SOURCES "${PROJECT_SOURCE_DIR}/linphone-app/ui") + + if (WIN32) + foreach (lang ${LANGUAGES}) diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/record-in-wav-format.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/record-in-wav-format.patch new file mode 100644 index 000000000000..1e71073968f1 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/record-in-wav-format.patch @@ -0,0 +1,48 @@ +diff --git a/linphone-app/src/components/call/CallModel.cpp b/linphone-app/src/components/call/CallModel.cpp +index d0286a89a..483bc35e4 100644 +--- a/linphone-app/src/components/call/CallModel.cpp ++++ b/linphone-app/src/components/call/CallModel.cpp +@@ -289,7 +289,7 @@ void CallModel::setRecordFile (const shared_ptr &callParam + callParams->setRecordFile(Utils::appStringToCoreString( + CoreManager::getInstance()->getSettingsModel()->getSavedCallsFolder() + .append(generateSavedFilename()) +- .append(".mkv") ++ .append(".wav") + )); + } + +@@ -303,7 +303,7 @@ void CallModel::setRecordFile (const shared_ptr &callParam + callParams->setRecordFile(Utils::appStringToCoreString( + CoreManager::getInstance()->getSettingsModel()->getSavedCallsFolder() + .append(generateSavedFilename(from, to)) +- .append(".mkv") ++ .append(".wav") + )); + } + +diff --git a/linphone-app/src/components/conference/ConferenceProxyModel.cpp b/linphone-app/src/components/conference/ConferenceProxyModel.cpp +index 0cf654dd4..931c0e5cf 100644 +--- a/linphone-app/src/components/conference/ConferenceProxyModel.cpp ++++ b/linphone-app/src/components/conference/ConferenceProxyModel.cpp +@@ -84,7 +84,7 @@ void ConferenceProxyModel::startRecording () { + + + mLastRecordFile = +- QStringLiteral("%1%2.mkv") ++ QStringLiteral("%1%2.wav") + .arg(coreManager->getSettingsModel()->getSavedCallsFolder()) + .arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm-ss")); + conference->startRecording(Utils::appStringToCoreString(mLastRecordFile) ); +diff --git a/linphone-app/src/components/recorder/RecorderModel.cpp b/linphone-app/src/components/recorder/RecorderModel.cpp +index 0d17ff6f8..5c6d7c679 100644 +--- a/linphone-app/src/components/recorder/RecorderModel.cpp ++++ b/linphone-app/src/components/recorder/RecorderModel.cpp +@@ -83,7 +83,7 @@ QDateTime RecorderModel::getDateTimeSavedFilename(const QString& filename){ + + void RecorderModel::start(){ + bool soFarSoGood; +- QString filename = QStringLiteral("vocal_%1.mkv") ++ QString filename = QStringLiteral("vocal_%1.wav") + .arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm-ss-zzz")); + const QString safeFilePath = Utils::getSafeFilePath( + QStringLiteral("%1%2") diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/remove-bc-versions.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/remove-bc-versions.patch new file mode 100644 index 000000000000..a1f8642b9979 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/remove-bc-versions.patch @@ -0,0 +1,15 @@ +diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt +index d40842fa2..7d7bc57d8 100644 +--- a/linphone-app/CMakeLists.txt ++++ b/linphone-app/CMakeLists.txt +@@ -40,10 +40,8 @@ set(version_minor) + set(version_patch) + set(identifiers ) + set(metadata ) +-bc_parse_full_version("${LINPHONEAPP_VERSION}" version_major version_minor version_patch identifiers metadata) + + +-project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") + + if(ENABLE_BUILD_VERBOSE) + #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/require-finding-packages.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/require-finding-packages.patch new file mode 100644 index 000000000000..2efcb4a9d2fb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/require-finding-packages.patch @@ -0,0 +1,41 @@ +diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt +index d40842fa2..5ea1330ca 100644 +--- a/linphone-app/CMakeLists.txt ++++ b/linphone-app/CMakeLists.txt +@@ -24,14 +24,11 @@ cmake_minimum_required(VERSION 3.22) + + + #Linphone targets +-set(LINPHONE_PACKAGES LinphoneCxx Mediastreamer2 Belcard LibLinphone) ++set(LINPHONE_PACKAGES LinphoneCxx Mediastreamer2 BelCard LibLinphone) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + +-find_package(BCToolbox) +-if(NOT BCToolbox_FOUND) +- find_package(bctoolbox CONFIG REQUIRED) +-endif() ++find_package(BCToolbox REQUIRED) + if(NOT LINPHONEAPP_VERSION) + bc_compute_full_version(LINPHONEAPP_VERSION) + endif() +@@ -105,17 +102,14 @@ set(ENABLE_DB_STORAGE ON CACHE BOOLEAN "Enable Storage") + + foreach(PACKAGE ${LINPHONE_PACKAGES}) + message(STATUS "Trying to find ${PACKAGE}") +- find_package(${PACKAGE}) +- if(NOT ${PACKAGE}_FOUND) +- find_package(${PACKAGE} CONFIG REQUIRED) +- endif() ++ find_package(${PACKAGE} REQUIRED) + endforeach() + + set(PLUGIN_TARGETS ${LinphoneCxx_TARGET}) + set(APP_TARGETS ${LinphoneCxx_TARGET} + ${BCToolbox_TARGET}#Logger/App + ${Mediastreamer2_TARGET}#MediastreamerUtils +- ${Belcard_TARGET}#VCard Model ++ ${BelCard_TARGET}#VCard Model + ${LibLinphone_TARGET})#MediastreamerUtils + + #################################### diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/unset-qml-dir.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/unset-qml-dir.patch new file mode 100644 index 000000000000..3d559f2d871c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/unset-qml-dir.patch @@ -0,0 +1,13 @@ +diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt +index d40842fa2..112d45711 100644 +--- a/linphone-app/CMakeLists.txt ++++ b/linphone-app/CMakeLists.txt +@@ -54,7 +54,6 @@ include(CheckCXXCompilerFlag) + + + set(TARGET_NAME linphone-qt) +-set(LINPHONE_QML_DIR "WORK/qml_files/ui") + set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS true) + set(CMAKE_CXX_STANDARD 14) + + diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix similarity index 56% rename from pkgs/development/libraries/mediastreamer/default.nix rename to pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix index d9e5e3080e56..dbc987f8b9b1 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix @@ -1,10 +1,7 @@ { bctoolbox, bzrtp, - cmake, - fetchFromGitLab, - fetchpatch2, - ffmpeg, + ffmpeg_4, glew, gsm, lib, @@ -12,32 +9,21 @@ libXext, libopus, libpulseaudio, + libsForQt5, libv4l, libvpx, + mkLinphoneDerivation, ortp, python3, - qtbase, - qtdeclarative, speex, + sqlite, srtp, - stdenv, }: - -stdenv.mkDerivation rec { +mkLinphoneDerivation (finalAttrs: { pname = "mediastreamer2"; - version = "5.2.111"; dontWrapQtApps = true; - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "mediastreamer2"; - rev = version; - hash = "sha256-Le52tsyzOpepmvb+GOGCPwwTriPUjhYpa6GM+y/6USA="; - }; - patches = [ # Plugins directory is normally fixed during compile time. This patch makes # it possible to set the plugins directory run time with an environment @@ -45,19 +31,12 @@ stdenv.mkDerivation rec { # plugin directory with desired plugins and wrap executables so that the # environment variable points to that directory. ./plugins_dir.patch - - # Port to ffmpeg 5.0 API - (fetchpatch2 { - url = "https://salsa.debian.org/pkg-voip-team/linphone-stack/mediastreamer2/-/raw/4e7784802d2eac57dffe210c8c23e696f40ac6ec/debian/patches/ffmpeg_5_0_fixes.patch"; - hash = "sha256-5ay4iVbx8IOX952HEFaKLBGKLRYUWRntufciApUVhh0="; - }) ]; nativeBuildInputs = [ - cmake python3 - qtbase - qtdeclarative + libsForQt5.qtbase + libsForQt5.qtdeclarative ]; propagatedBuildInputs = [ @@ -66,7 +45,7 @@ stdenv.mkDerivation rec { bzrtp ortp - ffmpeg + ffmpeg_4 glew libX11 libXext @@ -74,6 +53,7 @@ stdenv.mkDerivation rec { libv4l speex srtp + sqlite # Optional gsm # GSM audio codec @@ -84,20 +64,17 @@ stdenv.mkDerivation rec { strictDeps = true; cmakeFlags = [ - "-DENABLE_STATIC=NO" # Do not build static libraries "-DENABLE_QT_GL=ON" # Build necessary MSQOGL plugin for Linphone desktop - "-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${version}\"" + "-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${finalAttrs.version}\"" "-DENABLE_STRICT=NO" # Disable -Werror "-DENABLE_UNIT_TESTS=NO" # Do not build test executables ]; NIX_LDFLAGS = "-lXext"; - meta = with lib; { + meta = { description = "Powerful and lightweight streaming engine specialized for voice/video telephony applications. Part of the Linphone project"; - homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ jluttine ]; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/mediastreamer/plugins_dir.patch b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/plugins_dir.patch similarity index 100% rename from pkgs/development/libraries/mediastreamer/plugins_dir.patch rename to pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/plugins_dir.patch diff --git a/pkgs/applications/networking/instant-messengers/linphone/mk-linphone-derivation/default.nix b/pkgs/applications/networking/instant-messengers/linphone/mk-linphone-derivation/default.nix new file mode 100644 index 000000000000..8382fef530ac --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/mk-linphone-derivation/default.nix @@ -0,0 +1,61 @@ +{ + stdenv, + fetchFromGitLab, + lib, + cmake, + linphoneSdkVersion, + linphoneSdkHash, +}: +lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; + + excludeDrvArgNames = [ + "sourceRoot" + "version" + ]; + + extendDrvArgs = + finalAttrs: + { + sourceRoot ? finalAttrs.pname, + nativeBuildInputs ? [ ], + cmakeFlags ? [ ], + ... + }@args: + { + version = linphoneSdkVersion; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = "linphone-sdk"; + tag = linphoneSdkVersion; + hash = linphoneSdkHash; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + ] + ++ nativeBuildInputs; + + sourceRoot = "${finalAttrs.src.name}/${sourceRoot}"; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ] + ++ cmakeFlags; + + meta = { + homepage = "https://gitlab.linphone.org/BC/public/linphone-sdk"; + # maintainers for all linphone packages + maintainers = [ + lib.maintainers.jluttine + lib.maintainers.naxdy + ]; + platforms = lib.platforms.all; + } + // (lib.optionalAttrs (args ? meta) args.meta); + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/msopenh264/default.nix b/pkgs/applications/networking/instant-messengers/linphone/msopenh264/default.nix new file mode 100644 index 000000000000..55c08c2dacf8 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/msopenh264/default.nix @@ -0,0 +1,27 @@ +{ + mediastreamer2, + openh264, + lib, + mkLinphoneDerivation, +}: +mkLinphoneDerivation { + pname = "msopenh264"; + + buildInputs = [ + mediastreamer2 + openh264 + ]; + + # CMAKE_INSTALL_PREFIX has no effect so let's install manually. See: + # https://gitlab.linphone.org/BC/public/msopenh264/issues/1 + installPhase = '' + mkdir -p $out/lib/mediastreamer/plugins + cp lib/mediastreamer2/plugins/libmsopenh264.so $out/lib/mediastreamer/plugins/ + ''; + + meta = { + description = "H.264 encoder/decoder plugin for mediastreamer2. Part of the Linphone project"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch b/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch deleted file mode 100644 index dc1b0be916cd..000000000000 --- a/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6a26922e5e4363de36057d635a1bf889160b2533 Mon Sep 17 00:00:00 2001 -From: Lorenz Brun -Date: Fri, 28 Jan 2022 18:44:43 +0100 -Subject: [PATCH] Do not use store path for autostart on Nix - ---- - linphone-app/src/app/App.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp -index 868f8f44..2c61c648 100644 ---- a/linphone-app/src/app/App.cpp -+++ b/linphone-app/src/app/App.cpp -@@ -858,6 +858,10 @@ void App::setAutoStart (bool enabled) { - exec = QProcessEnvironment::systemEnvironment().value(QStringLiteral("APPIMAGE")); - qDebug() << "exec path autostart set appimage=" << exec; - } -+ else if (binPath.startsWith("/nix/store")) { // Nix/NixOS -+ exec = QStringLiteral("linphone"); -+ qDebug() << "exec path autostart set nix=" << exec; -+ } - else { //classic package - exec = binPath; - qDebug() << "exec path autostart set classic package=" << exec; --- -2.25.1 - diff --git a/pkgs/applications/networking/instant-messengers/linphone/ortp/default.nix b/pkgs/applications/networking/instant-messengers/linphone/ortp/default.nix new file mode 100644 index 000000000000..3c93f71ceb68 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/ortp/default.nix @@ -0,0 +1,18 @@ +{ + bctoolbox, + lib, + mkLinphoneDerivation, +}: +mkLinphoneDerivation { + pname = "ortp"; + + env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; + + buildInputs = [ bctoolbox ]; + + meta = { + description = "Real-Time Transport Protocol (RFC3550) stack. Part of the Linphone project"; + mainProgram = "ortp_tester"; + license = lib.licenses.agpl3Plus; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch b/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch deleted file mode 100644 index 225f0e78db23..000000000000 --- a/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 4849d5633b98e6d3514355436eab5ba537cbfd99 Mon Sep 17 00:00:00 2001 -From: David P -Date: Fri, 23 Oct 2020 16:44:17 -0300 -Subject: [PATCH] remove bc_compute_full_version usage - ---- - linphone-app/CMakeLists.txt | 11 +---------- - linphone-app/build/CMakeLists.txt | 5 ----- - .../cmake_builder/linphone_package/CMakeLists.txt | 10 +--------- - 3 files changed, 2 insertions(+), 24 deletions(-) - -diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt -index de7f917f..ee14ff78 100644 ---- a/linphone-app/CMakeLists.txt -+++ b/linphone-app/CMakeLists.txt -@@ -21,17 +21,8 @@ - ################################################################################ - cmake_minimum_required(VERSION 3.1) - -+include(linphoneqt_version.cmake) - find_package(bctoolbox CONFIG) --set(FULL_VERSION ) --bc_compute_full_version(FULL_VERSION) --set(version_major ) --set(version_minor ) --set(version_patch ) --set(identifiers ) --set(metadata ) --bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata) -- --project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") - - - if(ENABLE_BUILD_VERBOSE) -diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt -index 8ef03faa..97d94bd6 100644 ---- a/linphone-app/build/CMakeLists.txt -+++ b/linphone-app/build/CMakeLists.txt -@@ -46,11 +46,6 @@ set(CPACK_SOURCE_IGNORE_FILES - "libmng.spec" - ) - --bc_compute_full_version(PROJECT_VERSION_BUILD) --if(PROJECT_VERSION_BUILD) -- set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION_BUILD}") --endif() -- - message("-- Package file name is ${CPACK_PACKAGE_FILE_NAME}") - - set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}) -diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -index ac85c68a..e6af5a66 100644 ---- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -+++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -@@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui") - # ============================================================================== - # Build package version. - # ============================================================================== --bc_compute_full_version(APP_PROJECT_VERSION) --if (GIT_EXECUTABLE AND NOT(APP_PROJECT_VERSION)) -- execute_process( -- COMMAND ${GIT_EXECUTABLE} describe --always -- OUTPUT_VARIABLE APP_PROJECT_VERSION -- OUTPUT_STRIP_TRAILING_WHITESPACE -- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.." -- ) --elseif (NOT(APP_PROJECT_VERSION)) -+if (NOT(APP_PROJECT_VERSION)) - set(APP_PROJECT_VERSION "0.0.0") - endif () - string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}") --- -2.25.1 - diff --git a/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch b/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch deleted file mode 100644 index 2ad43fb17e28..000000000000 --- a/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5a4ab5..b6b89c2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,10 +59,10 @@ set(CMAKE_CXX_STANDARD 11) - - # Prepare gobal CMAKE configuration specific to the current project - set(SDK_BUILD_DIR "${CMAKE_BINARY_DIR}/WORK") # SDK build in WORK. Keep all in it. --set(LINPHONE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/linphone-sdk/desktop") --set(QTKEYCHAIN_OUTPUT_DIR "${CMAKE_BINARY_DIR}/qtkeychain") -+set(LINPHONE_OUTPUT_DIR "@out@") -+set(QTKEYCHAIN_OUTPUT_DIR "@out@") - set(QTKEYCHAIN_TARGET_NAME "EQt5Keychain") --set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") -+set(APPLICATION_OUTPUT_DIR "@out@") - - set(CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}/include${PREFIX_PATH}") - if(WIN32) diff --git a/pkgs/by-name/bc/bctoolbox/package.nix b/pkgs/by-name/bc/bctoolbox/package.nix deleted file mode 100644 index 46ccac25604e..000000000000 --- a/pkgs/by-name/bc/bctoolbox/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - bcunit, - cmake, - bc-decaf, - fetchFromGitLab, - mbedtls_2, - lib, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "bctoolbox"; - version = "5.2.109"; - - nativeBuildInputs = [ - cmake - ]; - buildInputs = [ - # Made by BC - bcunit - - # Vendored by BC - bc-decaf - - mbedtls_2 - ]; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "bctoolbox"; - tag = version; - hash = "sha256-OwwSGzMFwR2ajUUgAy7ea/Q2pWxn3DO72W7ukcjBJnU="; - }; - - # Do not build static libraries - cmakeFlags = [ - "-DENABLE_STATIC=NO" - "-DENABLE_STRICT=NO" - ]; - - strictDeps = true; - - meta = with lib; { - description = "Utilities library for Linphone"; - mainProgram = "bctoolbox_tester"; - homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ - raskin - jluttine - ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/bc/bcunit/package.nix b/pkgs/by-name/bc/bcunit/package.nix deleted file mode 100644 index 67eda14c47c9..000000000000 --- a/pkgs/by-name/bc/bcunit/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - cmake, - fetchFromGitLab, - lib, - stdenv, -}: - -stdenv.mkDerivation { - pname = "bcunit"; - version = "linphone-4.4.1"; - - nativeBuildInputs = [ cmake ]; - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "bcunit"; - rev = "c5eebcc7f794e9567d3c72d15d3f28bffe6bfd0f"; - sha256 = "sha256-8DSfqHerx/V00SJjTSQaG9Rjqx330iG6sGivBDUvQfA="; - }; - - meta = with lib; { - description = "Belledonne Communications' fork of CUnit test framework. Part of the Linphone project"; - homepage = "https://gitlab.linphone.org/BC/public/bcunit"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ - raskin - jluttine - ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/by-name/be/belcard/package.nix b/pkgs/by-name/be/belcard/package.nix deleted file mode 100644 index 57fbee6493a3..000000000000 --- a/pkgs/by-name/be/belcard/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - bctoolbox, - belr, - cmake, - fetchFromGitLab, - lib, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "belcard"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "belcard"; - tag = version; - sha256 = "sha256-pRNJ1bDS2v0Cn+6cxMeFa0JQ27UZR6kCI9P6gQ5W2GA="; - }; - - buildInputs = [ - bctoolbox - belr - ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DENABLE_STATIC=NO" # Do not build static libraries - "-DENABLE_UNIT_TESTS=NO" # Do not build test executables - ]; - - meta = with lib; { - description = "C++ library to manipulate VCard standard format. Part of the Linphone project"; - homepage = "https://gitlab.linphone.org/BC/public/belcard"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/by-name/be/belr/package.nix b/pkgs/by-name/be/belr/package.nix deleted file mode 100644 index 470c07f01f4b..000000000000 --- a/pkgs/by-name/be/belr/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - bctoolbox, - cmake, - fetchFromGitLab, - lib, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "belr"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "belr"; - tag = version; - hash = "sha256-4keVUAsTs1DAhOfV71VD28I0PEHnyvW95blplY690LY="; - }; - - buildInputs = [ bctoolbox ]; - nativeBuildInputs = [ cmake ]; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - meta = with lib; { - description = "Belledonne Communications' language recognition library. Part of the Linphone project"; - homepage = "https://gitlab.linphone.org/BC/public/belr"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/by-name/bz/bzrtp/package.nix b/pkgs/by-name/bz/bzrtp/package.nix deleted file mode 100644 index 600a23b474c8..000000000000 --- a/pkgs/by-name/bz/bzrtp/package.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - bctoolbox, - cmake, - fetchFromGitLab, - sqlite, - lib, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "bzrtp"; - version = "5.2.111"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "bzrtp"; - tag = version; - hash = "sha256-sLvvQhJ9uVt/dx57xs9ftY/ETi46xmyGDH8372zpqj8="; - }; - - buildInputs = [ - bctoolbox - sqlite - ]; - nativeBuildInputs = [ cmake ]; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=stringop-overflow" - "-Wno-error=unused-parameter" - ]; - - meta = with lib; { - description = "Opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project"; - homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/by-name/il/ilbc/package.nix b/pkgs/by-name/il/ilbc/package.nix index e529e9b4c6d8..b8e34d5d8f3d 100644 --- a/pkgs/by-name/il/ilbc/package.nix +++ b/pkgs/by-name/il/ilbc/package.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { cp -v ${./CMakeLists.txt} CMakeLists.txt ''; + # Fixes the build with CMake 4 + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ]; + meta = { platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/liblinphone/backport-cpp17.patch b/pkgs/by-name/li/liblinphone/backport-cpp17.patch deleted file mode 100644 index d9eb75fa2768..000000000000 --- a/pkgs/by-name/li/liblinphone/backport-cpp17.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 9ece6e77dcf6545c3b8104068302c6243e3a5e88 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micka=C3=ABl=20Turnel?= - -Date: Wed, 1 Mar 2023 09:14:53 +0100 -Subject: [PATCH] Set c++ version 17 and fix compilation errors - -Backported-by: Lorenz Brun - ---- - CMakeLists.txt | 2 +- - daemon/daemon.cc | 2 +- - libxsd/xsd/cxx/config.hxx | 2 +- - src/conference/session/streams-group.cpp | 10 +++++----- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 475ff16a8..a771e4595 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ cmake_dependent_option(ENABLE_QRCODE "Enable QRCode support" YES "ENABLE_VIDEO" - # * DISABLE_BC_PACKAGE_SEARCH: skip find_package() for every BC package (bctoolbox, ortp, etc.) - # * DISABLE_SOCI_PACKAGE_SEARCH: skip find_package() for Soci. - --set(CMAKE_CXX_STANDARD 14) -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_EXTENSIONS NO) - - if(NOT CMAKE_BUILD_TYPE) -diff --git a/daemon/daemon.cc b/daemon/daemon.cc -index 197fc22ef..fd09edb26 100644 ---- a/daemon/daemon.cc -+++ b/daemon/daemon.cc -@@ -628,7 +628,7 @@ void Daemon::execCommand(const string &command) { - ist.get(argsbuf); - string args = argsbuf.str(); - if (!args.empty() && (args[0] == ' ')) args.erase(0, 1); -- list::iterator it = find_if(mCommands.begin(), mCommands.end(), bind2nd(mem_fun(&DaemonCommand::matches), name)); -+ list::iterator it = find_if(mCommands.begin(), mCommands.end(), [&name](const DaemonCommand *dc) { return dc->matches(name); }); - if (it != mCommands.end()) { - ms_mutex_lock(&mMutex); - (*it)->exec(this, args); -diff --git a/libxsd/xsd/cxx/config.hxx b/libxsd/xsd/cxx/config.hxx -index 076b107f5..385841731 100644 ---- a/libxsd/xsd/cxx/config.hxx -+++ b/libxsd/xsd/cxx/config.hxx -@@ -19,7 +19,7 @@ - # endif - #else - # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L --# ifdef __GNUC__ -+# if defined(__GNUC__) && !defined(__clang__) - # if (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 - # define XSD_CXX11_NULLPTR - # endif -diff --git a/src/conference/session/streams-group.cpp b/src/conference/session/streams-group.cpp -index bff739dda..84277a6b7 100644 ---- a/src/conference/session/streams-group.cpp -+++ b/src/conference/session/streams-group.cpp -@@ -447,11 +447,11 @@ float StreamsGroup::computeOverallQuality(_functor func){ - } - - float StreamsGroup::getAverageQuality(){ -- return computeOverallQuality(mem_fun(&Stream::getAverageQuality)); -+ return computeOverallQuality(mem_fn(&Stream::getAverageQuality)); - } - - float StreamsGroup::getCurrentQuality(){ -- return computeOverallQuality(mem_fun(&Stream::getCurrentQuality)); -+ return computeOverallQuality(mem_fn(&Stream::getCurrentQuality)); - } - - int StreamsGroup::getAvpfRrInterval()const{ -@@ -481,11 +481,11 @@ bool StreamsGroup::avpfEnabled() const{ - } - - void StreamsGroup::refreshSockets(){ -- forEach(mem_fun(&Stream::refreshSockets)); -+ forEach(mem_fn(&Stream::refreshSockets)); - } - - void StreamsGroup::computeAndReportBandwidth(){ -- forEach(mem_fun(&Stream::updateBandwidthReports)); -+ forEach(mem_fn(&Stream::updateBandwidthReports)); - - if (!bctbx_log_level_enabled(BCTBX_LOG_DOMAIN, BCTBX_LOG_MESSAGE)) return; - -@@ -540,7 +540,7 @@ void StreamsGroup::finish(){ - mIceService->finish(); // finish ICE first, as it has actions on the streams. - for (auto & ss : mSharedServices) ss.second->checkDestroy(); - mSharedServices.clear(); -- forEach(mem_fun(&Stream::finish)); -+ forEach(mem_fn(&Stream::finish)); - mFinished = true; - } - --- -2.41.0 - diff --git a/pkgs/by-name/li/libosmoabis/package.nix b/pkgs/by-name/li/libosmoabis/package.nix index 0fb61587d710..ad13ba6ad468 100644 --- a/pkgs/by-name/li/libosmoabis/package.nix +++ b/pkgs/by-name/li/libosmoabis/package.nix @@ -6,8 +6,7 @@ pkg-config, libosmocore, libosmo-netif, - ortp, - bctoolbox, + linphonePackages, }: stdenv.mkDerivation rec { @@ -35,8 +34,8 @@ stdenv.mkDerivation rec { buildInputs = [ libosmocore libosmo-netif - ortp - bctoolbox + linphonePackages.ortp + linphonePackages.bctoolbox ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/lime/package.nix b/pkgs/by-name/li/lime/package.nix deleted file mode 100644 index 8545552f2c4a..000000000000 --- a/pkgs/by-name/li/lime/package.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - bctoolbox, - belle-sip, - cmake, - fetchFromGitLab, - lib, - bc-soci, - sqlite, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "lime"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "lime"; - rev = version; - hash = "sha256-LdwXBJpwSA/PoCXL+c1pcX1V2Fq/eR6nNmwBKDM1Vr8="; - }; - - buildInputs = [ - # Made by BC - bctoolbox - belle-sip - - # Vendored by BC - bc-soci - - sqlite - ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DENABLE_STATIC=NO" # Do not build static libraries - "-DENABLE_UNIT_TESTS=NO" # Do not build test executables - ]; - - meta = with lib; { - description = "End-to-end encryption library for instant messaging. Part of the Linphone project"; - homepage = "https://www.linphone.org/technical-corner/lime"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/by-name/ms/msilbc/package.nix b/pkgs/by-name/ms/msilbc/package.nix index 8addbb00b026..8af8f031323d 100644 --- a/pkgs/by-name/ms/msilbc/package.nix +++ b/pkgs/by-name/ms/msilbc/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, ilbc, - mediastreamer, + linphonePackages, pkg-config, }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ilbc - mediastreamer + linphonePackages.mediastreamer2 ]; nativeBuildInputs = [ pkg-config ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include" "MEDIASTREAMER_LIBS=mediastreamer" - "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include" + "MEDIASTREAMER_CFLAGS=-I${linphonePackages.mediastreamer2}/include" ]; meta = with lib; { diff --git a/pkgs/by-name/or/ortp/package.nix b/pkgs/by-name/or/ortp/package.nix deleted file mode 100644 index 958453e58784..000000000000 --- a/pkgs/by-name/or/ortp/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - bctoolbox, - cmake, - fetchFromGitLab, - lib, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "ortp"; - version = "5.2.109"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "ortp"; - rev = version; - hash = "sha256-EgUPICdKi8c/E6uonZB4DKyOZ3Od4JM5/bR2U6cq9ew="; - }; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; - - buildInputs = [ bctoolbox ]; - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Real-Time Transport Protocol (RFC3550) stack. Part of the Linphone project"; - mainProgram = "ortp_tester"; - homepage = "https://linphone.org/technical-corner/ortp"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/by-name/so/soci/package.nix similarity index 100% rename from pkgs/development/libraries/soci/default.nix rename to pkgs/by-name/so/soci/package.nix diff --git a/pkgs/by-name/tr/trx/package.nix b/pkgs/by-name/tr/trx/package.nix index 726b8e7615e7..2dcde72a0f6b 100644 --- a/pkgs/by-name/tr/trx/package.nix +++ b/pkgs/by-name/tr/trx/package.nix @@ -4,8 +4,7 @@ fetchurl, alsa-lib, libopus, - ortp, - bctoolbox, + linphonePackages, }: stdenv.mkDerivation rec { @@ -26,8 +25,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib libopus - ortp - bctoolbox + linphonePackages.ortp + linphonePackages.bctoolbox ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix deleted file mode 100644 index 0fb31d565b4b..000000000000 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - cmake, - fetchFromGitLab, - mediastreamer, - openh264, - lib, - stdenv, -}: - -stdenv.mkDerivation { - pname = "msopenh264"; - version = "linphone-4.4.1"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "msopenh264"; - rev = "5603a432be2ed10f5d5a5ce068ef83ab2a996d6b"; - sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - mediastreamer - openh264 - ]; - - # Do not build static libraries - cmakeFlags = [ - "-DENABLE_STATIC=NO" - "-DCMAKE_SKIP_INSTALL_RPATH=ON" - ]; - - # CMAKE_INSTALL_PREFIX has no effect so let's install manually. See: - # https://gitlab.linphone.org/BC/public/msopenh264/issues/1 - installPhase = '' - mkdir -p $out/lib/mediastreamer/plugins - cp src/libmsopenh264.so $out/lib/mediastreamer/plugins/ - ''; - - meta = with lib; { - description = "H.264 encoder/decoder plugin for mediastreamer2. Part of the Linphone project"; - homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index baa3cf426e0a..e882730c477c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -518,10 +518,17 @@ mapAliases { bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19 bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09 bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19 + bc-decaf = throw "'bc-decaf' has been moved to 'linphonePackages.bc-decaf'"; # Added 2025-09-20 + bc-soci = throw "'bc-soci' has been moved to 'linphonePackages.bc-soci'"; # Added 2025-09-20 + bctoolbox = throw "'bctoolbox' has been moved to 'linphonePackages.bctoolbox'"; # Added 2025-09-20 + bcunit = throw "'bcunit' has been moved to 'linphonePackages.bcunit'"; # Added 2025-09-20 BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01 beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18 inherit (beetsPackages) beets-unstable; + belcard = throw "'belcard' has been moved to 'linphonePackages.belcard'"; # Added 2025-09-20 + belle-sip = throw "'belle-sip' has been moved to 'linphonePackages.belle-sip'"; # Added 2025-09-20 + belr = throw "'belr' has been moved to 'linphonePackages.belr'"; # Added 2025-09-20 betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 @@ -580,6 +587,8 @@ mapAliases { bitwarden_rs-sqlite = vaultwarden-sqlite; # Added 2021-07-01 bitwarden_rs-vault = vaultwarden-vault; # Added 2021-07-01 + bzrtp = throw "'bzrtp' has been moved to 'linphonePackages.bzrtp'"; # Added 2025-09-20 + ### C ### caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20 @@ -1358,6 +1367,7 @@ mapAliases { libixp_hg = libixp; # Added 2022-04-25 libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 + liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20 libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16 libmusicbrainz5 = libmusicbrainz; # Added 2025-09-16 @@ -1408,8 +1418,10 @@ mapAliases { ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03 lima-bin = lib.warnOnInstantiate "lima-bin has been replaced by lima" lima; # Added 2025-05-13 lime3ds = throw "lime3ds is deprecated, use 'azahar' instead."; # Added 2025-03-22 + lime = throw "'lime' has been removed due to being unmaintained"; # Added 2025-03-20 limesctl = throw "limesctl has been removed because it is insignificant."; # Added 2024-11-25 linenoise-ng = throw "'linenoise-ng' has been removed as the upstream project was archived. Consider using 'linenoise' instead."; # Added 2025-05-05 + linphone = linphonePackages.linphone-desktop; # Added 2025-09-20 lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 lispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 @@ -1701,6 +1713,8 @@ mapAliases { mcomix3 = mcomix; # Added 2022-06-05 mdt = md-tui; # Added 2024-09-03 meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03 + mediastreamer = throw "'mediastreamer' has been moved to 'linphonePackages.mediastreamer2'"; # Added 2025-09-20 + mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20 meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17 memorymapping = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 memorymappingHook = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 @@ -2004,6 +2018,7 @@ mapAliases { openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03 opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19 orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17 + ortp = throw "'ortp' has been moved to 'linphonePackages.ortp'"; # Added 2025-09-20 omping = throw "'omping' has been removed because its upstream has been archived"; # Added 2025-05-10 onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20 onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f781b38ad4e..4af09590bec5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7039,8 +7039,6 @@ with pkgs; inherit (callPackages ../development/libraries/bashup-events { }) bashup-events32 bashup-events44; - bc-soci = callPackage ../development/libraries/soci/bc-soci.nix { }; - # TODO(@Ericson2314): Build bionic libc from source bionic = if stdenv.hostPlatform.useAndroidPrebuilt then @@ -8123,10 +8121,6 @@ with pkgs; mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { }; mbedtls = callPackage ../development/libraries/mbedtls/3.nix { }; - mediastreamer = libsForQt5.callPackage ../development/libraries/mediastreamer { }; - - mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { }; - mergerfs = callPackage ../tools/filesystems/mergerfs { }; mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { }; @@ -11804,8 +11798,6 @@ with pkgs; libutp = callPackage ../applications/networking/p2p/libutp { }; libutp_3_4 = callPackage ../applications/networking/p2p/libutp/3.4.nix { }; - linphone = libsForQt5.callPackage ../applications/networking/instant-messengers/linphone { }; - lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; libsoundio = null; @@ -12535,8 +12527,6 @@ with pkgs; super-slicer-latest = super-slicer.latest; - soci = callPackage ../development/libraries/soci { }; - socialscan = with python3.pkgs; toPythonApplication socialscan; sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; @@ -12763,6 +12753,10 @@ with pkgs; twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; + linphonePackages = recurseIntoAttrs ( + callPackage ../applications/networking/instant-messengers/linphone { } + ); + buildTypstPackage = callPackage ../build-support/build-typst-package.nix { }; typstPackages = typst.packages;