public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' (older one)

Browse Source 
Hydra seems OK-ish, except that some aarch64 jobs need restarting
after qt4 timing out for the first time:
https://hydra.nixos.org/eval/1412641?compare=1412561
This commit is contained in:
Vladimír Čunát
2017-11-24 18:29:15 +01:00
parent 1743953cc5 9ae72f2715
commit 7dfa97969a
106 changed files with 2055 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/analysis/kcov/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, binutils}:
{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}:
stdenv.mkDerivation rec {
name = "kcov-${version}";
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
};
preConfigure = "patchShebangs src/bin-to-c-source.py";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake zlib curl elfutils python libiberty binutils ];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib curl elfutils python libiberty libopcodes ];
enableParallelBuilding = true;