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

mumble: use bundled celt library again

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-10-12 17:04:49 +03:00
parent d6c83c30e6
commit 5963d94c3c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/mumble/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, pkgconfig { stdenv, fetchurl, fetchgit, pkgconfig
, qt4, qt5, avahi, boost, libopus, celt, libsndfile, protobuf, speex, libcap , qt4, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
, alsaLib , alsaLib
, jackSupport ? false, libjack2 ? null , jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? null , speechdSupport ? false, speechd ? null
@ -32,7 +32,7 @@ let
"CONFIG+=packaged" "CONFIG+=packaged"
"CONFIG+=no-update" "CONFIG+=no-update"
"CONFIG+=no-embed-qt-translations" "CONFIG+=no-embed-qt-translations"
"CONFIG+=no-bundled-celt" "CONFIG+=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"
@ -65,10 +65,9 @@ let
client = source: generic { client = source: generic {
type = "mumble"; type = "mumble";
NIX_CFLAGS_COMPILE = [ "-I${celt}/include/celt" ];
nativeBuildInputs = optional (source.qtVersion == 5) qt5.tools; nativeBuildInputs = optional (source.qtVersion == 5) qt5.tools;
buildInputs = [ libopus celt libsndfile speex ] buildInputs = [ libopus libsndfile speex ]
++ optional (source.qtVersion == 5) qt5.svg ++ optional (source.qtVersion == 5) qt5.svg
++ optional stdenv.isLinux alsaLib ++ optional stdenv.isLinux alsaLib
++ optional jackSupport libjack2 ++ optional jackSupport libjack2

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

@ -12197,7 +12197,6 @@ let
withLibdnssdCompat = true; withLibdnssdCompat = true;
}; };
qt5 = qt54; # Mumble is not compatible with qt55 yet qt5 = qt54; # Mumble is not compatible with qt55 yet
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;