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

mumble: 2015-09-27 -> 2015-11-08

Browse Source
This commit is contained in:
William A. Kennington III 2015-11-10 20:08:58 -08:00
parent bf985091d5
commit 9a24fec15f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,10 +20,10 @@ let
patches = optional jackSupport ./mumble-jack-support.patch; patches = optional jackSupport ./mumble-jack-support.patch;
nativeBuildInputs = [ pkgconfig ] nativeBuildInputs = [ pkgconfig ]
++ { qt4 = [ qt4 ]; qt5 = [ qt5.base ]; }."qt${toString source.qtVersion}" ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}"
++ (overrides.nativeBuildInputs or [ ]); ++ (overrides.nativeBuildInputs or [ ]);
buildInputs = [ boost protobuf avahi ] buildInputs = [ boost protobuf avahi ]
++ { qt4 = [ qt4 ]; qt5 = [ qt5.base ]; }."qt${toString source.qtVersion}" ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}"
++ (overrides.buildInputs or [ ]); ++ (overrides.buildInputs or [ ]);
configureFlags = [ configureFlags = [
@ -66,9 +66,9 @@ let
client = source: generic { client = source: generic {
type = "mumble"; type = "mumble";
nativeBuildInputs = optional (source.qtVersion == 5) qt5.tools; nativeBuildInputs = optional (source.qtVersion == 5) qt5.qttools;
buildInputs = [ libopus libsndfile speex ] buildInputs = [ libopus libsndfile speex ]
++ optional (source.qtVersion == 5) qt5.svg ++ optional (source.qtVersion == 5) qt5.qtsvg
++ optional stdenv.isLinux alsaLib ++ optional stdenv.isLinux alsaLib
++ optional jackSupport libjack2 ++ optional jackSupport libjack2
++ optional speechdSupport speechd ++ optional speechdSupport speechd
@ -116,13 +116,13 @@ let
}; };
gitSource = rec { gitSource = rec {
version = "1.3.0-git-2015-09-27"; version = "1.3.0-git-2015-11-08";
qtVersion = 5; qtVersion = 5;
src = fetchgit { src = fetchgit {
url = "https://github.com/mumble-voip/mumble"; url = "https://github.com/mumble-voip/mumble";
rev = "13e494c60beb20748eeb8be126b27e1226d168c8"; rev = "72038f6aa038f5964e2bba5a09d3d391d4680e5f";
sha256 = "1vihassis5i7hyljbb8qjihjj4y80n5l380x5dl0nwb55j2mylhg"; sha256 = "03978b85f7y0bffl8vwkmakjnxxjqapfz3pn0b8zf3b1ppwjy9g4";
}; };
# TODO: Remove fetchgit as it requires git # TODO: Remove fetchgit as it requires git

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

@ -12352,7 +12352,7 @@ let
avahi = avahi.override { avahi = avahi.override {
withLibdnssdCompat = true; withLibdnssdCompat = true;
}; };
qt5 = qt54; # Mumble is not compatible with qt55 yet qt5 = qt55; # Mumble is not compatible with qt55 yet
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;