diff options
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 44a83a028f547..b3d945710f094 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, mkDerivation -, qtbase, qttools, qtsvg, qmake, avahi, boost, libopus, libsndfile, protobuf, speex, libcap +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, qt5 +, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null @@ -14,12 +14,12 @@ assert iceSupport -> zeroc-ice != null; with stdenv.lib; let - generic = overrides: source: mkDerivation (source // overrides // { + generic = overrides: source: qt5.mkDerivation (source // overrides // { name = "${overrides.type}-${source.version}"; patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; - nativeBuildInputs = [ pkgconfig python qmake ] + nativeBuildInputs = [ pkgconfig python qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); buildInputs = [ boost protobuf avahi ] @@ -72,8 +72,8 @@ let client = source: generic { type = "mumble"; - nativeBuildInputs = [ qttools ]; - buildInputs = [ libopus libsndfile speex qtsvg ] + nativeBuildInputs = [ qt5.qttools ]; + buildInputs = [ libopus libsndfile speex qt5.qtsvg ] ++ optional stdenv.isLinux alsaLib ++ optional jackSupport libjack2 ++ optional speechdSupport speechd diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59cd01d011993..d30c04902f30a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19672,13 +19672,13 @@ in multimon-ng = callPackage ../applications/radio/multimon-ng { }; - murmur = (libsForQt5.callPackage ../applications/networking/mumble { + murmur = (callPackages ../applications/networking/mumble { avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; }).murmur; - mumble = (libsForQt5.callPackage ../applications/networking/mumble { + mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; |