public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mumble: use our celt library

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-07-31 13:41:43 +03:00
parent 7930150366
commit 47bb91194b
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 { stdenv, fetchurl, pkgconfig
, avahi, boost, libopus, libsndfile, protobuf, qt4, speex , avahi, boost, libopus, celt, libsndfile, protobuf, qt4, speex
, jackSupport ? false, libjack2 ? null , jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? null , speechdSupport ? false, speechd ? null
, pulseSupport ? false, libpulseaudio ? null , pulseSupport ? false, libpulseaudio ? null
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"CONFIG+=no-update" "CONFIG+=no-update"
"CONFIG+=no-server" "CONFIG+=no-server"
"CONFIG+=no-embed-qt-translations" "CONFIG+=no-embed-qt-translations"
"CONFIG+=bundled-celt" "CONFIG+=no-bundled-celt"
"CONFIG+=no-bundled-opus" "CONFIG+=no-bundled-opus"
"CONFIG+=no-bundled-speex" "CONFIG+=no-bundled-speex"
] ++ optional (!speechdSupport) "CONFIG+=no-speechd" ] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
@ -43,7 +43,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; 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 jackSupport libjack2
++ optional speechdSupport speechd ++ optional speechdSupport speechd
++ optional pulseSupport libpulseaudio; ++ optional pulseSupport libpulseaudio;

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

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