linphone: Cleanup dependencies
A lot of bloat had been accumulated through updates (e.g. with linphone migrating from Gtk to Qt, or linphone being split to liblinphone & linphone-desktop). Method: Through trial and error. Delete all dependencies, try to build, try to run, reintroduce missing dependencies. I have tested everything I could, but it is possible that some optional features have been silently disabled with dependencies not being found now. (Codecs, encryption schemes, etc...)
This commit is contained in:
parent
defbaa09f1
commit
fe8f77c2c0
|
@ -1,51 +1,18 @@
|
||||||
{ bcg729
|
{ bctoolbox
|
||||||
, bctoolbox
|
|
||||||
, bcunit
|
|
||||||
, belcard
|
, belcard
|
||||||
, belle-sip
|
, belle-sip
|
||||||
, belr
|
, belr
|
||||||
, bzrtp
|
|
||||||
, cairo
|
|
||||||
, cmake
|
, cmake
|
||||||
, cyrus_sasl
|
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
, fetchurl
|
|
||||||
, ffmpeg
|
|
||||||
, gdk-pixbuf
|
|
||||||
, glib
|
|
||||||
, graphviz
|
|
||||||
, gtk2
|
|
||||||
, intltool
|
|
||||||
, lib
|
, lib
|
||||||
, libexosip
|
|
||||||
, liblinphone
|
, liblinphone
|
||||||
, libmatroska
|
|
||||||
, libnotify
|
|
||||||
, libosip
|
|
||||||
, libsoup
|
|
||||||
, libupnp
|
|
||||||
, libX11
|
|
||||||
, libxml2
|
|
||||||
, makeWrapper
|
|
||||||
, mbedtls
|
|
||||||
, mediastreamer
|
, mediastreamer
|
||||||
, mediastreamer-openh264
|
, mediastreamer-openh264
|
||||||
, minizip2
|
, minizip2
|
||||||
, mkDerivation
|
, mkDerivation
|
||||||
, openldap
|
|
||||||
, ortp
|
|
||||||
, pango
|
|
||||||
, pkg-config
|
|
||||||
, qtbase
|
|
||||||
, qtgraphicaleffects
|
, qtgraphicaleffects
|
||||||
, qtquickcontrols2
|
, qtquickcontrols2
|
||||||
, qttranslations
|
, qttranslations
|
||||||
, readline
|
|
||||||
, speex
|
|
||||||
, sqlite
|
|
||||||
|
|
||||||
, udev
|
|
||||||
, zlib
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# How to update Linphone? (The Qt desktop app)
|
# How to update Linphone? (The Qt desktop app)
|
||||||
|
@ -95,57 +62,22 @@ mkDerivation rec {
|
||||||
# linphone-desktop.
|
# linphone-desktop.
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
# Made by BC
|
# Made by BC
|
||||||
bcg729
|
|
||||||
bctoolbox
|
bctoolbox
|
||||||
belcard
|
belcard
|
||||||
belle-sip
|
belle-sip
|
||||||
belr
|
belr
|
||||||
bzrtp
|
|
||||||
liblinphone
|
liblinphone
|
||||||
mediastreamer
|
mediastreamer
|
||||||
mediastreamer-openh264
|
mediastreamer-openh264
|
||||||
ortp
|
|
||||||
|
|
||||||
# Vendored by BC but we use upstream, might cause problems
|
|
||||||
libmatroska
|
|
||||||
|
|
||||||
cairo
|
|
||||||
cyrus_sasl
|
|
||||||
ffmpeg
|
|
||||||
gdk-pixbuf
|
|
||||||
glib
|
|
||||||
gtk2
|
|
||||||
libX11
|
|
||||||
libexosip
|
|
||||||
libnotify
|
|
||||||
libosip
|
|
||||||
libsoup
|
|
||||||
libupnp
|
|
||||||
libxml2
|
|
||||||
mbedtls
|
|
||||||
minizip2
|
minizip2
|
||||||
openldap
|
|
||||||
pango
|
|
||||||
qtbase
|
|
||||||
qtgraphicaleffects
|
qtgraphicaleffects
|
||||||
qtquickcontrols2
|
qtquickcontrols2
|
||||||
qttranslations
|
qttranslations
|
||||||
readline
|
|
||||||
speex
|
|
||||||
sqlite
|
|
||||||
udev
|
|
||||||
zlib
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
# Made by BC
|
|
||||||
bcunit
|
|
||||||
|
|
||||||
cmake
|
cmake
|
||||||
graphviz
|
|
||||||
intltool
|
|
||||||
makeWrapper
|
|
||||||
pkg-config
|
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
|
@ -22,8 +22,10 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [ bctoolbox belr ];
|
buildInputs = [ bctoolbox belr ];
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
# Do not build static libraries
|
cmakeFlags = [
|
||||||
cmakeFlags = [ "-DENABLE_STATIC=NO" ];
|
"-DENABLE_STATIC=NO" # Do not build static libraries
|
||||||
|
"-DENABLE_UNIT_TESTS=NO" # Do not build test executables
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "C++ library to manipulate VCard standard format. Part of the Linphone project.";
|
description = "C++ library to manipulate VCard standard format. Part of the Linphone project.";
|
||||||
|
|
|
@ -1,50 +1,20 @@
|
||||||
{ bcg729
|
{ bctoolbox
|
||||||
, bctoolbox
|
|
||||||
, bcunit
|
|
||||||
, belcard
|
, belcard
|
||||||
, belle-sip
|
, belle-sip
|
||||||
, belr
|
, belr
|
||||||
, bzrtp
|
|
||||||
, cairo
|
|
||||||
, cmake
|
, cmake
|
||||||
, cyrus_sasl
|
|
||||||
, doxygen
|
, doxygen
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
, ffmpeg
|
|
||||||
, gdk-pixbuf
|
|
||||||
, glib
|
|
||||||
, graphviz
|
|
||||||
, gtk2
|
|
||||||
, intltool
|
|
||||||
, jsoncpp
|
, jsoncpp
|
||||||
, libexosip
|
|
||||||
, libmatroska
|
|
||||||
, libnotify
|
|
||||||
, libosip
|
|
||||||
, libsoup
|
|
||||||
, libupnp
|
|
||||||
, libX11
|
|
||||||
, libxml2
|
, libxml2
|
||||||
, lime
|
, lime
|
||||||
, makeWrapper
|
|
||||||
, mbedtls
|
|
||||||
, mediastreamer
|
, mediastreamer
|
||||||
, openldap
|
|
||||||
, ortp
|
|
||||||
, pango
|
|
||||||
, pkg-config
|
|
||||||
, python3
|
, python3
|
||||||
, readline
|
|
||||||
, bc-soci
|
, bc-soci
|
||||||
, boost
|
|
||||||
, speex
|
|
||||||
, sqlite
|
, sqlite
|
||||||
, lib
|
, lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, udev
|
|
||||||
, xercesc
|
, xercesc
|
||||||
, xsd
|
|
||||||
, zlib
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -62,69 +32,31 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patches = [ ./use-normal-jsoncpp.patch ];
|
patches = [ ./use-normal-jsoncpp.patch ];
|
||||||
|
|
||||||
# Do not build static libraries
|
cmakeFlags = [
|
||||||
cmakeFlags = [ "-DENABLE_STATIC=NO" ];
|
"-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 = [
|
buildInputs = [
|
||||||
(python3.withPackages (ps: [ ps.pystache ps.six ]))
|
|
||||||
|
|
||||||
# Made by BC
|
# Made by BC
|
||||||
bcg729
|
|
||||||
bctoolbox
|
|
||||||
belcard
|
belcard
|
||||||
belle-sip
|
belle-sip
|
||||||
belr
|
|
||||||
bzrtp
|
|
||||||
lime
|
lime
|
||||||
mediastreamer
|
mediastreamer
|
||||||
ortp
|
|
||||||
|
|
||||||
# Vendored by BC
|
# Vendored by BC
|
||||||
bc-soci
|
bc-soci
|
||||||
|
|
||||||
# Vendored by BC but we use upstream, might cause problems
|
|
||||||
libmatroska
|
|
||||||
|
|
||||||
cairo
|
|
||||||
cyrus_sasl
|
|
||||||
ffmpeg
|
|
||||||
gdk-pixbuf
|
|
||||||
glib
|
|
||||||
gtk2
|
|
||||||
libX11
|
|
||||||
libexosip
|
|
||||||
libnotify
|
|
||||||
libosip
|
|
||||||
libsoup
|
|
||||||
libupnp
|
|
||||||
libxml2
|
|
||||||
mbedtls
|
|
||||||
openldap
|
|
||||||
pango
|
|
||||||
readline
|
|
||||||
boost
|
|
||||||
speex
|
|
||||||
sqlite
|
|
||||||
udev
|
|
||||||
xercesc
|
|
||||||
xsd
|
|
||||||
zlib
|
|
||||||
jsoncpp
|
jsoncpp
|
||||||
|
libxml2
|
||||||
|
(python3.withPackages (ps: [ ps.pystache ps.six ]))
|
||||||
|
sqlite
|
||||||
|
xercesc
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
# Made by BC
|
|
||||||
bcunit
|
|
||||||
|
|
||||||
cmake
|
cmake
|
||||||
doxygen
|
doxygen
|
||||||
graphviz
|
|
||||||
intltool
|
|
||||||
makeWrapper
|
|
||||||
pkg-config
|
|
||||||
];
|
];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
, lib
|
, lib
|
||||||
, bc-soci
|
, bc-soci
|
||||||
, sqlite
|
, sqlite
|
||||||
, boost
|
|
||||||
, stdenv
|
, stdenv
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -31,12 +30,13 @@ stdenv.mkDerivation rec {
|
||||||
bc-soci
|
bc-soci
|
||||||
|
|
||||||
sqlite
|
sqlite
|
||||||
boost
|
|
||||||
];
|
];
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
# Do not build static libraries
|
cmakeFlags = [
|
||||||
cmakeFlags = [ "-DENABLE_STATIC=NO" ];
|
"-DENABLE_STATIC=NO" # Do not build static libraries
|
||||||
|
"-DENABLE_UNIT_TESTS=NO" # Do not build test executables
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "End-to-end encryption library for instant messaging. Part of the Linphone project.";
|
description = "End-to-end encryption library for instant messaging. Part of the Linphone project.";
|
||||||
|
|
|
@ -1,33 +1,21 @@
|
||||||
{ alsa-lib
|
{ bctoolbox
|
||||||
, bctoolbox
|
|
||||||
, bzrtp
|
, bzrtp
|
||||||
, cmake
|
, cmake
|
||||||
, doxygen
|
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
, ffmpeg
|
, ffmpeg
|
||||||
, glew
|
, glew
|
||||||
, gsm
|
, gsm
|
||||||
, intltool
|
|
||||||
, lib
|
, lib
|
||||||
, libGL
|
|
||||||
, libGLU
|
|
||||||
, libX11
|
, libX11
|
||||||
, libXext
|
, libXext
|
||||||
, libXv
|
|
||||||
, libmatroska
|
|
||||||
, libopus
|
, libopus
|
||||||
, libpcap
|
|
||||||
, libpulseaudio
|
, libpulseaudio
|
||||||
, libtheora
|
|
||||||
, libupnp
|
|
||||||
, libv4l
|
, libv4l
|
||||||
, libvpx
|
, libvpx
|
||||||
, ortp
|
, ortp
|
||||||
, pkg-config
|
|
||||||
, python3
|
, python3
|
||||||
, qtbase
|
, qtbase
|
||||||
, qtdeclarative
|
, qtdeclarative
|
||||||
, SDL
|
|
||||||
, speex
|
, speex
|
||||||
, srtp
|
, srtp
|
||||||
, stdenv
|
, stdenv
|
||||||
|
@ -59,9 +47,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
doxygen
|
|
||||||
intltool
|
|
||||||
pkg-config
|
|
||||||
python3
|
python3
|
||||||
qtbase
|
qtbase
|
||||||
qtdeclarative
|
qtdeclarative
|
||||||
|
@ -73,28 +58,19 @@ stdenv.mkDerivation rec {
|
||||||
bzrtp
|
bzrtp
|
||||||
ortp
|
ortp
|
||||||
|
|
||||||
# Vendored by BC but we use upstream, might cause problems
|
|
||||||
libmatroska
|
|
||||||
|
|
||||||
alsa-lib
|
|
||||||
ffmpeg
|
ffmpeg
|
||||||
glew
|
glew
|
||||||
gsm
|
|
||||||
libGL
|
|
||||||
libGLU
|
|
||||||
libX11
|
libX11
|
||||||
libXext
|
libXext
|
||||||
libXv
|
|
||||||
libopus
|
|
||||||
libpcap
|
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
libtheora
|
|
||||||
libupnp
|
|
||||||
libv4l
|
libv4l
|
||||||
libvpx
|
|
||||||
SDL
|
|
||||||
speex
|
speex
|
||||||
srtp
|
srtp
|
||||||
|
|
||||||
|
# Optional
|
||||||
|
gsm # GSM audio codec
|
||||||
|
libopus # Opus audio codec
|
||||||
|
libvpx # VP8 video codec
|
||||||
];
|
];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
@ -104,6 +80,7 @@ stdenv.mkDerivation rec {
|
||||||
"-DENABLE_QT_GL=ON" # Build necessary MSQOGL plugin for Linphone desktop
|
"-DENABLE_QT_GL=ON" # Build necessary MSQOGL plugin for Linphone desktop
|
||||||
"-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${version}\""
|
"-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${version}\""
|
||||||
"-DENABLE_STRICT=NO" # Disable -Werror
|
"-DENABLE_STRICT=NO" # Disable -Werror
|
||||||
|
"-DENABLE_UNIT_TESTS=NO" # Do not build test executables
|
||||||
];
|
];
|
||||||
|
|
||||||
NIX_LDFLAGS = "-lXext";
|
NIX_LDFLAGS = "-lXext";
|
||||||
|
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8=";
|
sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook cmake pkg-config ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ mediastreamer openh264 ];
|
buildInputs = [ mediastreamer openh264 ];
|
||||||
|
|
||||||
# Do not build static libraries
|
# Do not build static libraries
|
||||||
|
|
Loading…
Reference in a new issue