diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-10-08 01:44:48 +0200 |
|---|---|---|
| committer | Silvan Mosberger <infinisil@icloud.com> | 2019-10-08 01:46:11 +0200 |
| commit | 27605cebae4c8a8e2703f6cedc24d92059acbf7f (patch) | |
| tree | 322083c9e8fbc3793f7841b623e3aaf49e38f37c /pkgs/applications/networking/mumble | |
| parent | b81de296fbefd585143f223ed86a3c33a6a03d6a (diff) | |
mumble/murmur: Fix .override not working
Unfortunately there's no pkgs.libsForQt5.callPackages, which we need here to
get .override attributes on all derivation attributes. It's also
non-trivial to add it without duplicating code.
So instead just use standard pkgs.callPackages and pass refer to qt libs
through pkgs.qt5
Diffstat (limited to 'pkgs/applications/networking/mumble')
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 44a83a028f54..b3d945710f09 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 |