diff options
author | Felix Singer <felixsinger@posteo.net> | 2023-05-12 21:26:57 +0200 |
---|---|---|
committer | Felix Singer <felixsinger@posteo.net> | 2023-05-12 23:19:20 +0200 |
commit | 948e9e1c4281cb3f2603a9d398fac02d3c3d7712 (patch) | |
tree | 4bbf72b1f5548b791d306d5ba29204275fb04976 /pkgs/top-level | |
parent | 1b77011674f7011142b76f637134413dcd2fe540 (diff) |
mumble: Apply patch to use OpenSSL 3.0 API
Mumble is using a deprecated OpenSSL API and this is causing problems because OpenSSL 1.1 support should be dropped from nixpkgs. However, a patch making Mumble compatible to the OpenSSL 3.0 API is available on its master branch and included in the latest snapshot, but unfortunately that snapshot is not production ready. Apply the patch for the nixpkgs build so that we can get rid of that old OpenSSL version and drop the specific Qt package using it. Signed-off-by: Felix Singer <felixsinger@posteo.net>
Diffstat (limited to 'pkgs/top-level')
-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 { |