diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-10-12 17:04:49 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-10-12 17:55:00 +0300 |
| commit | 5963d94c3c323c7262653be1607b64bb24aee489 (patch) | |
| tree | 0ad9a5de47b41955e40e32c7faa4ea34abd6ce6b /pkgs/applications/networking/mumble/default.nix | |
| parent | d6c83c30e684cb782ea487d0d3d2d992a9311b24 (diff) | |
mumble: use bundled celt library again
Diffstat (limited to 'pkgs/applications/networking/mumble/default.nix')
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 1e9fc99c29ddc..8660d94a9e0bc 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, pkgconfig -, qt4, qt5, avahi, boost, libopus, celt, libsndfile, protobuf, speex, libcap +, qt4, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null @@ -32,7 +32,7 @@ let "CONFIG+=packaged" "CONFIG+=no-update" "CONFIG+=no-embed-qt-translations" - "CONFIG+=no-bundled-celt" + "CONFIG+=bundled-celt" "CONFIG+=no-bundled-opus" "CONFIG+=no-bundled-speex" ] ++ optional (!speechdSupport) "CONFIG+=no-speechd" @@ -65,10 +65,9 @@ let client = source: generic { type = "mumble"; - NIX_CFLAGS_COMPILE = [ "-I${celt}/include/celt" ]; nativeBuildInputs = optional (source.qtVersion == 5) qt5.tools; - buildInputs = [ libopus celt libsndfile speex ] + buildInputs = [ libopus libsndfile speex ] ++ optional (source.qtVersion == 5) qt5.svg ++ optional stdenv.isLinux alsaLib ++ optional jackSupport libjack2 |