diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index aececbb6130b6..afe27eb381498 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bc69da5f2874..a160834562140 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12124,6 +12124,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; |