From 02b32550db7521eb1616175e8bb0c82968c412bb Mon Sep 17 00:00:00 2001 From: Atkins Chang Date: Thu, 5 Aug 2021 06:33:21 +0800 Subject: [PATCH] cargo-tarpaulin: support darwin Signed-off-by: Atkins Chang --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index ebbfa619fed3..338c711e5274 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -1,4 +1,4 @@ -{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, curl, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ curl Security ]; cargoSha256 = "sha256-1lFGczzcN4QPsIpEVQiSmNS7L+9rlSfxi+gopt2E7Ec="; #checkFlags = [ "--test-threads" "1" ]; @@ -25,6 +26,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/xd009642/tarpaulin"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ hugoreeves ]; - platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7766eb1f26f..3785ffbc08c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12151,7 +12151,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-rr = callPackage ../development/tools/rust/cargo-rr { }; - cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; + cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-update = callPackage ../tools/package-management/cargo-update { inherit (darwin.apple_sdk.frameworks) Security; };