From 3e2943ab8eda2c0bf13210110e57d60a49a6177c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 4 Mar 2021 10:40:58 +0100 Subject: [PATCH] wrangler: build against system OpenSSL Wrangler was built against a vendored, static OpenSSL. Use the system OpenSSL instead to benefit from security updates, etc. --- pkgs/development/tools/wrangler/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index f867fd836a3..f43a0a369d6 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, perl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation }: rustPlatform.buildRustPackage rec { pname = "wrangler"; @@ -13,12 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk"; - nativeBuildInputs = [ perl ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ]; + OPENSSL_NO_VENDOR = 1; + # tries to use "/homeless-shelter" and fails doCheck = false;