From c7159bf25e48d23529b55eabf9a318fc33dfb8b8 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Tue, 7 Nov 2023 10:58:56 +0100 Subject: [PATCH] tqsl: unpin OpenSSL revert cc120206d830998a1bcb8ad7aa9f1b2e8c213b31 as TQSL can now be built against OpenSSL 3.x --- pkgs/applications/radio/tqsl/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index 085706658afff..a207ba2f14681 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { openssl zlib lmdb - (curl.override { inherit openssl; }) + curl wxGTK32 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b316c559463f..489ee46642672 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35932,9 +35932,7 @@ with pkgs; toxiproxy = callPackage ../development/tools/toxiproxy { }; - tqsl = callPackage ../applications/radio/tqsl { - openssl = openssl_1_1; - }; + tqsl = callPackage ../applications/radio/tqsl { }; trustedqsl = tqsl; # Alias added 2019-02-10 transcode = callPackage ../applications/audio/transcode { };