alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #9065 from abbradar/mumble-celt

Browse source 
mumble: use our celt library
This commit is contained in:
Nikolay Amiantov 2015-08-01 12:17:25 +03:00
parent 85e2c8ff23 47bb91194b
commit 49c14b1553
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/networking/mumble/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
, avahi, boost, libopus, libsndfile, protobuf, qt4, speex
, avahi, boost, libopus, celt, libsndfile, protobuf, qt4, speex
, jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? null
, pulseSupport ? false, libpulseaudio ? null
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"CONFIG+=no-update"
"CONFIG+=no-server"
"CONFIG+=no-embed-qt-translations"
"CONFIG+=bundled-celt"
"CONFIG+=no-bundled-celt"
"CONFIG+=no-bundled-opus"
"CONFIG+=no-bundled-speex"
] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
@ -43,7 +43,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ avahi boost libopus libsndfile protobuf qt4 speex ]
NIX_CFLAGS_COMPILE = [ "-I${celt}/include/celt" ];
buildInputs = [ avahi boost libopus celt libsndfile protobuf qt4 speex ]
++ optional jackSupport libjack2
++ optional speechdSupport speechd
++ optional pulseSupport libpulseaudio;

1
pkgs/top-level/all-packages.nix
View file

@ -12127,6 +12127,7 @@ let
avahi = avahi.override {
withLibdnssdCompat = true;
};
celt = celt_0_7;
jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;