pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #171368 from ThibaultLemaire/update-linphone-4-4-1

linphone: Cleanup dependencies

authored by 7c6f434c and committed by GitHub 7bdbbba6 1324b2b7

+24 -181
unified split
+1 -69
pkgs/applications/networking/instant-messengers/linphone/default.nix
··· 1 - { bcg729 2 - , bctoolbox 3 - , bcunit 1 + { bctoolbox 4 2 , belcard 5 3 , belle-sip 6 4 , belr 7 - , bzrtp 8 - , cairo 9 5 , cmake 10 - , cyrus_sasl 11 6 , fetchFromGitLab 12 - , fetchurl 13 - , ffmpeg 14 - , gdk-pixbuf 15 - , glib 16 - , graphviz 17 - , gtk2 18 - , intltool 19 7 , lib 20 - , libexosip 21 8 , liblinphone 22 - , libmatroska 23 - , libnotify 24 - , libosip 25 - , libsoup 26 - , libupnp 27 - , libX11 28 - , libxml2 29 - , makeWrapper 30 - , mbedtls 31 9 , mediastreamer 32 10 , mediastreamer-openh264 33 11 , minizip2 34 12 , mkDerivation 35 - , openldap 36 - , ortp 37 - , pango 38 - , pkg-config 39 - , qtbase 40 13 , qtgraphicaleffects 41 14 , qtquickcontrols2 42 15 , qttranslations 43 - , readline 44 - , speex 45 - , sqlite 46 - 47 - , udev 48 - , zlib 49 16 }: 50 17 51 18 # How to update Linphone? (The Qt desktop app) ··· 95 62 # linphone-desktop. 96 63 buildInputs = [ 97 64 # Made by BC 98 - bcg729 99 65 bctoolbox 100 66 belcard 101 67 belle-sip 102 68 belr 103 - bzrtp 104 69 liblinphone 105 70 mediastreamer 106 71 mediastreamer-openh264 107 - ortp 108 72 109 - # Vendored by BC but we use upstream, might cause problems 110 - libmatroska 111 - 112 - cairo 113 - cyrus_sasl 114 - ffmpeg 115 - gdk-pixbuf 116 - glib 117 - gtk2 118 - libX11 119 - libexosip 120 - libnotify 121 - libosip 122 - libsoup 123 - libupnp 124 - libxml2 125 - mbedtls 126 73 minizip2 127 - openldap 128 - pango 129 - qtbase 130 74 qtgraphicaleffects 131 75 qtquickcontrols2 132 76 qttranslations 133 - readline 134 - speex 135 - sqlite 136 - udev 137 - zlib 138 77 ]; 139 78 140 79 nativeBuildInputs = [ 141 - # Made by BC 142 - bcunit 143 - 144 80 cmake 145 - graphviz 146 - intltool 147 - makeWrapper 148 - pkg-config 149 81 ]; 150 82 151 83 cmakeFlags = [
+4 -2
pkgs/development/libraries/belcard/default.nix
··· 22 22 buildInputs = [ bctoolbox belr ]; 23 23 nativeBuildInputs = [ cmake ]; 24 24 25 - # Do not build static libraries 26 - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; 25 + cmakeFlags = [ 26 + "-DENABLE_STATIC=NO" # Do not build static libraries 27 + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables 28 + ]; 27 29 28 30 meta = with lib; { 29 31 description = "C++ library to manipulate VCard standard format. Part of the Linphone project.";
+7 -75
pkgs/development/libraries/liblinphone/default.nix
··· 1 - { bcg729 2 - , bctoolbox 3 - , bcunit 1 + { bctoolbox 4 2 , belcard 5 3 , belle-sip 6 4 , belr 7 - , bzrtp 8 - , cairo 9 5 , cmake 10 - , cyrus_sasl 11 6 , doxygen 12 7 , fetchFromGitLab 13 - , ffmpeg 14 - , gdk-pixbuf 15 - , glib 16 - , graphviz 17 - , gtk2 18 - , intltool 19 8 , jsoncpp 20 - , libexosip 21 - , libmatroska 22 - , libnotify 23 - , libosip 24 - , libsoup 25 - , libupnp 26 - , libX11 27 9 , libxml2 28 10 , lime 29 - , makeWrapper 30 - , mbedtls 31 11 , mediastreamer 32 - , openldap 33 - , ortp 34 - , pango 35 - , pkg-config 36 12 , python3 37 - , readline 38 13 , bc-soci 39 - , boost 40 - , speex 41 14 , sqlite 42 15 , lib 43 16 , stdenv 44 - , udev 45 17 , xercesc 46 - , xsd 47 - , zlib 48 18 }: 49 19 50 20 stdenv.mkDerivation rec { ··· 62 32 63 33 patches = [ ./use-normal-jsoncpp.patch ]; 64 34 65 - # Do not build static libraries 66 - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; 35 + cmakeFlags = [ 36 + "-DENABLE_STATIC=NO" # Do not build static libraries 37 + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables 38 + ]; 67 39 68 - # TODO: Not sure if all these inputs are actually needed. Most of them were 69 - # defined when liblinphone and linphone-desktop weren't separated yet, so some 70 - # of them might not be needed for liblinphone alone. 71 40 buildInputs = [ 72 - (python3.withPackages (ps: [ ps.pystache ps.six ])) 73 - 74 41 # Made by BC 75 - bcg729 76 - bctoolbox 77 42 belcard 78 43 belle-sip 79 - belr 80 - bzrtp 81 44 lime 82 45 mediastreamer 83 - ortp 84 46 85 47 # Vendored by BC 86 48 bc-soci 87 49 88 - # Vendored by BC but we use upstream, might cause problems 89 - libmatroska 90 - 91 - cairo 92 - cyrus_sasl 93 - ffmpeg 94 - gdk-pixbuf 95 - glib 96 - gtk2 97 - libX11 98 - libexosip 99 - libnotify 100 - libosip 101 - libsoup 102 - libupnp 50 + jsoncpp 103 51 libxml2 104 - mbedtls 105 - openldap 106 - pango 107 - readline 108 - boost 109 - speex 52 + (python3.withPackages (ps: [ ps.pystache ps.six ])) 110 53 sqlite 111 - udev 112 54 xercesc 113 - xsd 114 - zlib 115 - jsoncpp 116 55 ]; 117 56 118 57 nativeBuildInputs = [ 119 - # Made by BC 120 - bcunit 121 - 122 58 cmake 123 59 doxygen 124 - graphviz 125 - intltool 126 - makeWrapper 127 - pkg-config 128 60 ]; 129 61 130 62 strictDeps = true;
+4 -4
pkgs/development/libraries/lime/default.nix
··· 5 5 , lib 6 6 , bc-soci 7 7 , sqlite 8 - , boost 9 8 , stdenv 10 9 }: 11 10 ··· 31 30 bc-soci 32 31 33 32 sqlite 34 - boost 35 33 ]; 36 34 nativeBuildInputs = [ cmake ]; 37 35 38 - # Do not build static libraries 39 - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; 36 + cmakeFlags = [ 37 + "-DENABLE_STATIC=NO" # Do not build static libraries 38 + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables 39 + ]; 40 40 41 41 meta = with lib; { 42 42 description = "End-to-end encryption library for instant messaging. Part of the Linphone project.";
+7 -30
pkgs/development/libraries/mediastreamer/default.nix
··· 1 - { alsa-lib 2 - , bctoolbox 1 + { bctoolbox 3 2 , bzrtp 4 3 , cmake 5 - , doxygen 6 4 , fetchFromGitLab 7 5 , ffmpeg 8 6 , glew 9 7 , gsm 10 - , intltool 11 8 , lib 12 - , libGL 13 - , libGLU 14 9 , libX11 15 10 , libXext 16 - , libXv 17 - , libmatroska 18 11 , libopus 19 - , libpcap 20 12 , libpulseaudio 21 - , libtheora 22 - , libupnp 23 13 , libv4l 24 14 , libvpx 25 15 , ortp 26 - , pkg-config 27 16 , python3 28 17 , qtbase 29 18 , qtdeclarative 30 - , SDL 31 19 , speex 32 20 , srtp 33 21 , stdenv ··· 59 47 60 48 nativeBuildInputs = [ 61 49 cmake 62 - doxygen 63 - intltool 64 - pkg-config 65 50 python3 66 51 qtbase 67 52 qtdeclarative ··· 73 58 bzrtp 74 59 ortp 75 60 76 - # Vendored by BC but we use upstream, might cause problems 77 - libmatroska 78 - 79 - alsa-lib 80 61 ffmpeg 81 62 glew 82 - gsm 83 - libGL 84 - libGLU 85 63 libX11 86 64 libXext 87 - libXv 88 - libopus 89 - libpcap 90 65 libpulseaudio 91 - libtheora 92 - libupnp 93 66 libv4l 94 - libvpx 95 - SDL 96 67 speex 97 68 srtp 69 + 70 + # Optional 71 + gsm # GSM audio codec 72 + libopus # Opus audio codec 73 + libvpx # VP8 video codec 98 74 ]; 99 75 100 76 strictDeps = true; ··· 104 80 "-DENABLE_QT_GL=ON" # Build necessary MSQOGL plugin for Linphone desktop 105 81 "-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${version}\"" 106 82 "-DENABLE_STRICT=NO" # Disable -Werror 83 + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables 107 84 ]; 108 85 109 86 NIX_LDFLAGS = "-lXext";
+1 -1
pkgs/development/libraries/mediastreamer/msopenh264.nix
··· 22 22 sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8="; 23 23 }; 24 24 25 - nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; 25 + nativeBuildInputs = [ cmake ]; 26 26 buildInputs = [ mediastreamer openh264 ]; 27 27 28 28 # Do not build static libraries