nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-02 10:14:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33800 from adisbladis/mumble-qt59

Browse Source 
mumble_git: 2017-05-25 -> 2018-01-12
This commit is contained in:
Jörg Thalheim 2018-01-13 12:20:42 +00:00 committed by GitHub
commit c11b87b573
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,14 +119,14 @@ let
}; };
gitSource = rec { gitSource = rec {
version = "2017-05-25"; version = "2018-01-12";
qtVersion = 5; qtVersion = 5;
# Needs submodules # Needs submodules
src = fetchgit { src = fetchgit {
url = "https://github.com/mumble-voip/mumble"; url = "https://github.com/mumble-voip/mumble";
rev = "3754898ac94ed3f1e86408114917d1b4c06f17b3"; rev = "e348e47f4af68eaa8e0f87d1d9fc28c5583e421e";
sha256 = "1qh49x3y7m0c0h0gcs6amkf8nb75p6g611zwn19mbplwmi7h9y8f"; sha256 = "12z41qfaq6w3i4wcw8pvyb8wwwa8gs3ar5zx6aqx6yssc6513lr3";
}; };
}; };
in { in {

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

@ -16134,7 +16134,6 @@ with pkgs;
avahi = avahi.override { avahi = avahi.override {
withLibdnssdCompat = true; withLibdnssdCompat = true;
}; };
qt5 = qt56; # Mumble doesn't work with Qt > 5.5
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;
@ -16145,7 +16144,6 @@ with pkgs;
avahi = avahi.override { avahi = avahi.override {
withLibdnssdCompat = true; withLibdnssdCompat = true;
}; };
qt5 = qt56; # Mumble doesn't work with Qt > 5.5
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;