From c0cc06c245fb150bdc87cd26dde3ba098742acb7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 4 Nov 2021 22:11:03 -0400 Subject: [PATCH] cargo-deny: don't vendor openssl, fix license --- .../tools/rust/cargo-deny/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index ba151a17549d..02bc561b1573 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -1,8 +1,11 @@ -{ stdenv -, lib +{ lib , rustPlatform , fetchFromGitHub -, perl, pkg-config, openssl, Security, libiconv, curl +, pkg-config +, openssl +, stdenv +, curl +, Security }: rustPlatform.buildRustPackage rec { @@ -20,17 +23,20 @@ rustPlatform.buildRustPackage rec { doCheck = false; - nativeBuildInputs = [ perl pkg-config ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ curl Security ]; + + cargoBuildFlags = [ "--no-default-features" ]; + + cargoTestFlags = cargoBuildFlags; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; homepage = "https://github.com/EmbarkStudios/cargo-deny"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer ]; + changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } -