diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de42c90e2d1c9..6750ae5112bbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23460,18 +23460,6 @@ with pkgs; inherit lib pkgs qt5; }); - # TODO: remove once no package needs this anymore or together with OpenSSL 1.1 - # Current users: mumble, murmur - qt5_openssl_1_1 = qt5.overrideScope (_: super: { - qtbase = super.qtbase.override { - openssl = openssl_1_1; - libmysqlclient = libmysqlclient.override { - openssl = openssl_1_1; - curl = curl.override { openssl = openssl_1_1; }; - }; - }; - }); - # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop plasma5Packages = libsForQt5; @@ -32510,14 +32498,12 @@ with pkgs; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; grpcSupport = config.murmur.grpcSupport or true; - qt5 = qt5_openssl_1_1; }).murmur; mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - qt5 = qt5_openssl_1_1; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { |