Merge pull request #76313 from oxalica/cargo-flamegraph-perf

cargo-flamegraph: fix runtime dep: linux-perf
This commit is contained in:
Maximilian Bosch 2020-01-02 23:54:57 +01:00 committed by GitHub
commit af26f69257
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform
{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, perf
, Security
}:
@ -15,11 +15,19 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0kmw2n4j5bisac0bv3npbwfz2z00ncd6w8ichwaz5hac5mi1a72f";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
buildInputs = lib.optionals stdenv.isDarwin [
Security
];
meta = with stdenv.lib; {
postFixup = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/cargo-flamegraph \
--suffix PATH ':' ${perf}/bin
wrapProgram $out/bin/flamegraph \
--suffix PATH ':' ${perf}/bin
'';
meta = with lib; {
description = "Easy flamegraphs for Rust projects and everything else, without Perl or pipes <3";
homepage = https://github.com/ferrous-systems/flamegraph;
license = with licenses; [ asl20 /* or */ mit ];

View file

@ -8679,6 +8679,7 @@ in
cargo-flamegraph = callPackage ../development/tools/cargo-flamegraph {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (linuxPackages) perf;
};
carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { };