diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-07-22 22:06:44 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-07-23 20:22:14 +0200 |
| commit | f6f2f38a6e782b981bca42e4c98e0a918625a711 (patch) | |
| tree | ad89920ea0ce97979fca673bb6a895ed7634ec01 /pkgs/applications/networking/mumble/default.nix | |
| parent | cbd8f7093bc398103be51c07cca74ea832598dc3 (diff) | |
jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a 'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1' and 'jack2' in both package name and attrname. This aligns the naming with what can be found on the JACK homepage. Q: what's the difference between jack1 and jack2? A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
Diffstat (limited to 'pkgs/applications/networking/mumble/default.nix')
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index b2b2e37fd663a..0f2a3d93cdbcd 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qt4, boost, protobuf, libsndfile , speex, libopus, avahi, pkgconfig , jackSupport ? false -, jackaudio ? null +, jack2 ? null , speechdSupport ? false , speechd ? null }: -assert jackSupport -> jackaudio != null; +assert jackSupport -> jack2 != null; assert speechdSupport -> speechd != null; let @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 boost protobuf libsndfile speex libopus avahi pkgconfig ] - ++ (optional jackSupport jackaudio) + ++ (optional jackSupport jack2) ++ (optional speechdSupport speechd); installPhase = '' |