diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-04-27 23:25:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-27 23:25:27 +0100 |
commit | 68d144b6eda1d1b0412b86596f688f179b43d257 (patch) | |
tree | 05be0cec526cdcd8902c3d68ad0ee62eaa796c7a /pkgs/development/tools | |
parent | 91e58ad48ae5f6d64d3989f7ca133fe90a9b20cc (diff) | |
parent | 4317f7ab26942b4fad23f616932a1df1611bd44b (diff) | |
download | nixlib-68d144b6eda1d1b0412b86596f688f179b43d257.tar nixlib-68d144b6eda1d1b0412b86596f688f179b43d257.tar.gz nixlib-68d144b6eda1d1b0412b86596f688f179b43d257.tar.bz2 nixlib-68d144b6eda1d1b0412b86596f688f179b43d257.tar.lz nixlib-68d144b6eda1d1b0412b86596f688f179b43d257.tar.xz nixlib-68d144b6eda1d1b0412b86596f688f179b43d257.tar.zst nixlib-68d144b6eda1d1b0412b86596f688f179b43d257.zip |
Merge pull request #39624 from Ekleog/kcov-35
kcov: 34 -> 35
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch | 12 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/kcov/default.nix | 8 |
2 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch new file mode 100644 index 000000000000..d5c3662e9abf --- /dev/null +++ b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch @@ -0,0 +1,12 @@ +diff --git a/src/engines/ptrace.cc b/src/engines/ptrace.cc +index 59b615f..e02cddf 100644 +--- a/src/engines/ptrace.cc ++++ b/src/engines/ptrace.cc +@@ -21,6 +21,7 @@ + + #if defined(__aarch64__) + # include <sys/uio.h> ++# include <elf.h> + #endif + + #include <map> diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 3c3665e72200..7d75d9a34e1a 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kcov-${version}"; - version = "34"; + version = "35"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "1i4pn5na8m308pssk8585nmqi8kwd63a9h2rkjrn4w78ibmxvj01"; + sha256 = "1da9vm87pi5m9ika0q1f1ai85w3vwlap8yln147yr9sc37jp5jcw"; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; + patches = [ ./aarch64_nt_prstatus.patch ]; + enableParallelBuilding = true; meta = with stdenv.lib; { @@ -32,7 +34,7 @@ stdenv.mkDerivation rec { homepage = http://simonkagstrom.github.io/kcov/index.html; license = licenses.gpl2; - maintainers = [ maintainers.gal_bolle ]; + maintainers = with maintainers; [ gal_bolle ekleog ]; platforms = platforms.linux; }; } |