From bacecfa3b617eefe9e1391b935c98c0bc78efaaa Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 15:28:59 +0200 Subject: [PATCH] lighthouse: use OpenSSL from Nixpkgs --- pkgs/applications/blockchains/lighthouse/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 4d1a81d5da1a..2afce895da6e 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -6,7 +6,7 @@ , lighthouse , nix-update-script , nodePackages -, perl +, openssl , pkg-config , postgresql , protobuf @@ -57,7 +57,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook cmake - perl pkg-config protobuf ]; @@ -65,6 +64,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys sqlite + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security @@ -84,6 +85,8 @@ rustPlatform.buildRustPackage rec { LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}"; LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}"; + OPENSSL_NO_VENDOR = true; + cargoBuildFlags = [ "--package lighthouse" ];