Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

2 files changed, 78 insertions, 75 deletions

diff --git a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix
index 2d4a1004d87f..10c2bfb272c8 100644
--- a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix
@@ -1,53 +1,25 @@
-{ bcg729
-, bctoolbox
-, bcunit
+{ bctoolbox
 , belcard
 , belle-sip
 , belr
-, bzrtp
-, cairo
 , cmake
-, cyrus_sasl
 , doxygen
 , fetchFromGitLab
-, ffmpeg
-, gdk-pixbuf
-, glib
-, graphviz
-, gtk2
-, intltool
-, libexosip
-, libmatroska
-, libnotify
-, libosip
-, libsoup
-, libupnp
-, libX11
+, jsoncpp
 , libxml2
 , lime
-, makeWrapper
-, mbedtls
 , mediastreamer
-, openldap
-, ortp
-, pango
-, pkg-config
 , python3
-, readline
-, soci
-, boost
-, speex
+, bc-soci
 , sqlite
-, lib, stdenv
-, udev
+, lib
+, stdenv
 , xercesc
-, xsd
-, zlib
 }:
 
 stdenv.mkDerivation rec {
   pname = "liblinphone";
-  version = "4.5.17";
+  version = "5.1.22";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
@@ -55,62 +27,36 @@ stdenv.mkDerivation rec {
     group = "BC";
     repo = pname;
     rev = version;
-    sha256 = "sha256-ryyT4bG3lnE72ydvCAoiT3IeHY4mZwX9nCqaTRC1wyc=";
+    sha256 = "sha256-hTyp/fUA1+7J1MtqX33kH8Vn1XNjx51Wy5REvrpdJTY=";
   };
 
-  # Do not build static libraries
-  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
+  patches = [ ./use-normal-jsoncpp.patch ];
+
+  cmakeFlags = [
+    "-DENABLE_STATIC=NO" # Do not build static libraries
+    "-DENABLE_UNIT_TESTS=NO" # Do not build test executables
+  ];
 
-  # TODO: Not sure if all these inputs are actually needed. Most of them were
-  # defined when liblinphone and linphone-desktop weren't separated yet, so some
-  # of them might not be needed for liblinphone alone.
   buildInputs = [
-    (python3.withPackages (ps: [ ps.pystache ps.six ]))
-    bcg729
-    bctoolbox
+    # Made by BC
     belcard
     belle-sip
-    belr
-    bzrtp
-    cairo
-    cyrus_sasl
-    ffmpeg
-    gdk-pixbuf
-    glib
-    gtk2
-    libX11
-    libexosip
-    libmatroska
-    libnotify
-    libosip
-    libsoup
-    libupnp
-    libxml2
     lime
-    mbedtls
     mediastreamer
-    openldap
-    ortp
-    pango
-    readline
-    soci
-    boost
-    speex
+
+    # Vendored by BC
+    bc-soci
+
+    jsoncpp
+    libxml2
+    (python3.withPackages (ps: [ ps.pystache ps.six ]))
     sqlite
-    udev
     xercesc
-    xsd
-    zlib
   ];
 
   nativeBuildInputs = [
-    bcunit
     cmake
     doxygen
-    graphviz
-    intltool
-    makeWrapper
-    pkg-config
   ];
 
   strictDeps = true;
diff --git a/nixpkgs/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch b/nixpkgs/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch
new file mode 100644
index 000000000000..4685b327ecd3
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch
@@ -0,0 +1,57 @@
+From ea6901c9ed0f804bd2d6d09e514610518c2f4f09 Mon Sep 17 00:00:00 2001
+From: Lorenz Brun <lorenz@brun.one>
+Date: Fri, 18 Mar 2022 17:36:22 +0100
+Subject: [PATCH] Use normal jsoncpp
+
+---
+ src/CMakeLists.txt    | 6 +++---
+ tester/CMakeLists.txt | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5cd87fe9a..822b2151e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI)
+ 	if (XCODE)
+ 		list(APPEND LINK_LIBS jsoncpp_static)
+ 	else()
+-		list(APPEND LINK_LIBS jsoncpp_object)
++		list(APPEND LINK_LIBS jsoncpp)
+ 	endif()
+ endif()
+ 
+@@ -592,7 +592,7 @@ if(ENABLE_STATIC)
+ 		if (XCODE)
+ 			target_link_libraries(linphone PRIVATE jsoncpp_static)
+ 		else()
+-			target_link_libraries(linphone PRIVATE jsoncpp_object)
++			target_link_libraries(linphone PRIVATE jsoncpp)
+ 		endif()
+ 	endif()
+ 
+@@ -646,7 +646,7 @@ if(ENABLE_SHARED)
+ 		if (XCODE)
+ 			target_link_libraries(linphone PRIVATE jsoncpp_static)
+ 		else()
+-			target_link_libraries(linphone PRIVATE jsoncpp_object)
++			target_link_libraries(linphone PRIVATE jsoncpp)
+ 		endif()
+ 	endif()
+ 
+diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
+index b97042678..b4c5a5794 100644
+--- a/tester/CMakeLists.txt
++++ b/tester/CMakeLists.txt
+@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI)
+ 	if (XCODE)
+ 		list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static)
+ 	else()
+-		list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object)
++		list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp)
+ 	endif()
+ endif()
+ 
+-- 
+2.25.1
+