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/top-level | |
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/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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; |