Merge pull request #266031 from wamserma/tqsl-unpin-openssl

tqsl: unpin OpenSSL
NixOS · Nov 7, 2023 · 67ff7c0 · 67ff7c0
2 parents 3e0bd2a + c7159bf
commit 67ff7c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -35896,9 +35896,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 { };
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { @@
         openssl
         zlib
         lmdb
-        (curl.override { inherit openssl; })
+        curl
         wxGTK32
       ];
@@ Expand Down @@