From 7824706368a469b63848f25d12664bc18e39b84a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 15:49:09 +0200 Subject: [PATCH] rover: use OpenSSL from Nixpkgs --- pkgs/development/tools/rover/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index 92b5339fdfe9..978935595fec 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -1,7 +1,8 @@ { lib , fetchFromGitHub -, perl +, pkg-config , rustPlatform +, openssl , darwin , stdenv }: @@ -19,16 +20,22 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ - perl + pkg-config ]; + env = { + OPENSSL_NO_VENDOR = true; + }; + # This test checks whether the plugins specified in the plugins json file are # valid by making a network call to the repo that houses their binaries; but, the # build env can't make network calls (impurity)