From 8b7199f00be6189f81b9dfecb3b88a42697b54f4 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Fri, 4 Oct 2024 12:08:03 -0700 Subject: [PATCH] tealdeer: rustls -> native-tls --- pkgs/tools/misc/tealdeer/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index 428c235e394d5..1b6ab3b7c30da 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -3,6 +3,8 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, pkg-config +, openssl , Security }: @@ -19,9 +21,22 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-WCbpwvCXm54/Cv+TscaqseWzTUd8V1DxmS30fUZZTwI="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; + # use OpenSSL for the TLS backend instead of the default rustls + buildNoDefaultFeatures = true; + buildFeatures = [ "native-tls" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Security + ]; + + env.OPENSSL_NO_VENDOR = true; postInstall = '' installShellCompletion --cmd tldr \