diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-08-01 12:17:25 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-08-01 12:17:25 +0300 |
| commit | 49c14b1553e272506270ca1a37d12ad36cdd2b1d (patch) | |
| tree | 2046657aab0e69b388c14626cda6d229d9fbe05e /pkgs | |
| parent | 85e2c8ff23feb5f6344acde44d8b51d46c4ba89a (diff) | |
| parent | 47bb91194b251f54cf3ad48e62a828cfc4530d1c (diff) | |
| download | nixpkgs-49c14b1553e272506270ca1a37d12ad36cdd2b1d.tar nixpkgs-49c14b1553e272506270ca1a37d12ad36cdd2b1d.tar.gz nixpkgs-49c14b1553e272506270ca1a37d12ad36cdd2b1d.tar.bz2 nixpkgs-49c14b1553e272506270ca1a37d12ad36cdd2b1d.tar.lz nixpkgs-49c14b1553e272506270ca1a37d12ad36cdd2b1d.tar.xz nixpkgs-49c14b1553e272506270ca1a37d12ad36cdd2b1d.tar.zst nixpkgs-49c14b1553e272506270ca1a37d12ad36cdd2b1d.zip | |
Merge pull request #9065 from abbradar/mumble-celt
mumble: use our celt library
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 aececbb6130..afe27eb3814 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 149c77a0bf2..dda7224cb39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |