commit 81a6e50110ecaa0db9bce51b3a5398f43ab8b636 · pyrox.dev/nixpkgs

+9 -5

pkgs/applications/networking/instant-messengers/linphone/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp

     

       2
       2
        
       , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev

     

       3
       3
       -
       , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip

     

       3
       3
       +
       , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp

     

       4
       4
        
       , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake

     

       5
       5
        
       , libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl

     

       6
       6
       +
       , python, graphviz, belcard

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       stdenv.mkDerivation rec {

     

       9
       10
        
         baseName = "linphone";

     

       10
       10
       -
         version = "3.10.2";

     

       11
       11
       +
         version = "3.12.0";

     

       11
       12
        
         name = "${baseName}-${version}";

     

       12
       13
        
       

     

       13
       14
        
         src = fetchFromGitHub {

     

       14
       15
        
           owner = "BelledonneCommunications";

     

       15
       16
        
           repo = "${baseName}";

     

       16
       17
        
           rev = "${version}";

     

       17
       17
       -
           sha256 = "053gad4amdbq5za8f2n9j5q59nkky0w098zbsa3dvpcqvv7ar16p";

     

       18
       18
       +
           sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j";

     

       18
       19
        
         };

     

       19
       20
        
       

     

       20
       21
        
         buildInputs = [

     

       21
       22
        
           readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11

     

       22
       23
        
           polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip

     

       23
       23
       -
           bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango

     

       24
       24
       +
           bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango bzrtp belcard

     

       24
       25
        
         ];

     

       25
       26
        
       

     

       26
       26
       -
         nativeBuildInputs = [ intltool pkgconfig makeWrapper cmake doxygen ];

     

       27
       27
       +
         nativeBuildInputs = [

     

       28
       28
       +
           intltool pkgconfig makeWrapper cmake doxygen graphviz

     

       29
       29
       +
           (python.withPackages (ps: [ ps.pystache ps.six ]))

     

       30
       30
       +
         ];

     

       27
       31
        
       

     

       28
       32
        
         NIX_CFLAGS_COMPILE = " -Wno-error -I${glib.dev}/include/glib-2.0

     

       29
       33
        
           -I${glib.out}/lib/glib-2.0/include -I${gtk2.dev}/include/gtk-2.0/

+2 -2

pkgs/development/libraries/bctoolbox/default.nix

···

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
        
         name = "${baseName}-${version}";

     

       4
       4
        
         baseName = "bctoolbox";

     

       5
       5
       -
         version = "0.2.0";

     

       5
       5
       +
         version = "0.6.0";

     

       6
       6
        
         buildInputs = [cmake mbedtls bcunit srtp];

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "BelledonneCommunications";

     

       9
       9
        
           repo = "${baseName}";

     

       10
       10
        
           rev = "${version}";

     

       11
       11
       -
           sha256 = "09mjqdfjxy4jy1z68b2i99hgkbnhhk7vnbfhj9sdpd1p3jk2ha33";

     

       11
       11
       +
           sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         meta = {

+24

pkgs/development/libraries/belcard/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, belr }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         baseName = "belcard";

     

       5
       5
       +
         version = "1.0.2";

     

       6
       6
       +
         name = "${baseName}-${version}";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "BelledonneCommunications";

     

       10
       10
       +
           repo = "${baseName}";

     

       11
       11
       +
           rev = "${version}";

     

       12
       12
       +
           sha256 = "1pwji83vpsdrfma24rnj3rz1x0a0g6zk3v4xjnip7zf2ys3zcnlk";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         buildInputs = [ bctoolbox belr ];

     

       16
       16
       +
         nativeBuildInputs = [ cmake ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with stdenv.lib;{

     

       19
       19
       +
           description = "Belcard is a C++ library to manipulate VCard standard format";

     

       20
       20
       +
           homepage = https://github.com/BelledonneCommunications/belcard;

     

       21
       21
       +
           license = licenses.lgpl21;

     

       22
       22
       +
           platforms = platforms.all;

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+2 -2

pkgs/development/libraries/belle-sip/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         baseName = "belle-sip";

     

       7
       7
       -
         version = "1.5.0";

     

       7
       7
       +
         version = "1.6.3";

     

       8
       8
        
         name = "${baseName}-${version}";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "BelledonneCommunications";

     

       12
       12
        
           repo = "${baseName}";

     

       13
       13
        
           rev = "${version}";

     

       14
       14
       -
           sha256 = "0hnm64hwgq003wicz6c485fryjfhi820fgin8ndknq60kvwxsrzn";

     

       14
       14
       +
           sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ jre cmake ];

+24

pkgs/development/libraries/belr/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         baseName = "belr";

     

       5
       5
       +
         version = "0.1.3";

     

       6
       6
       +
         name = "${baseName}-${version}";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "BelledonneCommunications";

     

       10
       10
       +
           repo = "${baseName}";

     

       11
       11
       +
           rev = "${version}";

     

       12
       12
       +
           sha256 = "0mf8lsyq1z3b5p47c00lnwc8n7v9nzs1fd2g9c9hnz6fjd2ka44w";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         buildInputs = [ bctoolbox ];

     

       16
       16
       +
         nativeBuildInputs = [ cmake ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with stdenv.lib;{

     

       19
       19
       +
           description = "Belr is Belledonne Communications' language recognition library";

     

       20
       20
       +
           homepage = https://github.com/BelledonneCommunications/belr;

     

       21
       21
       +
           license = licenses.lgpl21;

     

       22
       22
       +
           platforms = platforms.all;

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+24

pkgs/development/libraries/bzrtp/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, sqlite }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         baseName = "bzrtp";

     

       5
       5
       +
         version = "1.0.6";

     

       6
       6
       +
         name = "${baseName}-${version}";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "BelledonneCommunications";

     

       10
       10
       +
           repo = "${baseName}";

     

       11
       11
       +
           rev = "${version}";

     

       12
       12
       +
           sha256 = "0438zzxp82bj5fmvqnwlljkgrz9ab5qm5lgpwwgmg1cp78bp2l45";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         buildInputs = [ bctoolbox sqlite ];

     

       16
       16
       +
         nativeBuildInputs = [ cmake ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with stdenv.lib; {

     

       19
       19
       +
           description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol";

     

       20
       20
       +
           homepage = https://github.com/BelledonneCommunications/bzrtp;

     

       21
       21
       +
           license = licenses.lgpl21;

     

       22
       22
       +
           platforms = platforms.all;

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+11 -4

pkgs/development/libraries/mediastreamer/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm

     

       2
       2
        
       , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp

     

       3
       3
        
       , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen

     

       4
       4
       -
       , python, libXext, libmatroska, openssl

     

       4
       4
       +
       , python, libXext, libmatroska, openssl, fetchpatch

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         baseName = "mediastreamer2";

     

       9
       9
       -
         version = "2.14.0";

     

       9
       9
       +
         version = "2.16.1";

     

       10
       10
        
         name = "${baseName}-${version}";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "BelledonneCommunications";

     

       14
       14
        
           repo = "${baseName}";

     

       15
       15
        
           rev = "${version}";

     

       16
       16
       -
           sha256 = "1b59rzsaw54mhy4pz9hndmim4rgidkn7s6c4iyl34mz58lwxpmqp";

     

       16
       16
       +
           sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         patches = [ ./plugins_dir.patch ];

     

       19
       19
       +
         patches = [

     

       20
       20
       +
           (fetchpatch {

     

       21
       21
       +
             name = "allow-build-without-git.patch";

     

       22
       22
       +
             url = "https://github.com/BelledonneCommunications/mediastreamer2/commit/de3a24b795d7a78e78eab6b974e7ec5abf2259ac.patch";

     

       23
       23
       +
             sha256 = "1zqkrab42n4dha0knfsyj4q0wc229ma125gk9grj67ps7r7ipscy";

     

       24
       24
       +
           })

     

       25
       25
       +
           ./plugins_dir.patch

     

       26
       26
       +
         ];

     

       20
       27
        
       

     

       21
       28
        
         nativeBuildInputs = [ pkgconfig intltool cmake doxygen python ];

     

       22
       29

+2 -2

pkgs/development/libraries/ortp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         baseName = "ortp";

     

       5
       5
       -
         version = "0.27.0";

     

       5
       5
       +
         version = "1.0.2";

     

       6
       6
        
         name = "${baseName}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "BelledonneCommunications";

     

       10
       10
        
           repo = "${baseName}";

     

       11
       11
        
           rev = "${version}";

     

       12
       12
       -
           sha256 = "0gjaaph4pamay9gn1yn7ky5wyzhj93r53rwak7h8s48vf08fqyv7";

     

       12
       12
       +
           sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ bctoolbox ];

+6

pkgs/top-level/all-packages.nix

···

       8196
       8196
        
       

     

       8197
       8197
        
         beecrypt = callPackage ../development/libraries/beecrypt { };

     

       8198
       8198
        
       

     

       8199
       8199
       +
         belcard = callPackage ../development/libraries/belcard { };

     

       8200
       8200
       +
       

     

       8201
       8201
       +
         belr = callPackage ../development/libraries/belr { };

     

       8202
       8202
       +
       

     

       8199
       8203
        
         beignet = callPackage ../development/libraries/beignet {

     

       8200
       8204
        
           inherit (llvmPackages_39) llvm clang-unwrapped;

     

       8201
       8205
        
         };

     
···

       8234
       8238
        
         buddy = callPackage ../development/libraries/buddy { };

     

       8235
       8239
        
       

     

       8236
       8240
        
         bwidget = callPackage ../development/libraries/bwidget { };

     

       8241
       8241
       +
       

     

       8242
       8242
       +
         bzrtp = callPackage ../development/libraries/bzrtp { };

     

       8237
       8243
        
       

     

       8238
       8244
        
         c-ares = callPackage ../development/libraries/c-ares {

     

       8239
       8245
        
           fetchurl = fetchurlBoot;