cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

lcov: Support gcc 9

Browse source 
https://github.com/linux-test-project/lcov/issues/58
https://github.com/Homebrew/homebrew-core/pull/50070
This commit is contained in:
Eelco Dolstra 2020-02-28 12:31:02 +01:00
parent 2e89e0d0cd
commit 74c82056c9
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/development/tools/analysis/lcov/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl}: {stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lcov-1.14"; name = "lcov-1.14";
@ -8,13 +8,28 @@ stdenv.mkDerivation rec {
sha256 = "06h7ixyznf6vz1qvksjgy5f3q2nw9akf6zx59npf0h3l32cmd68l"; sha256 = "06h7ixyznf6vz1qvksjgy5f3q2nw9akf6zx59npf0h3l32cmd68l";
}; };
buildInputs = [ perl ]; patches =
[ (fetchpatch {
url = https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7.patch;
sha256 = "1z9jfqpj34jnzdvmqr5fs8hl56bvbwd8xhlbg3chcswbjj97vk7l";
})
(fetchpatch {
url = https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da.patch;
sha256 = "1wgd4y7vhvfnxyhdd0z2pi9ys6l0z88f14i69a7prb296m1zwg5j";
})
];
buildInputs = [ perl makeWrapper ];
preBuild = '' preBuild = ''
patchShebangs bin/ patchShebangs bin/
makeFlagsArray=(PREFIX=$out LCOV_PERL_PATH=$(command -v perl)) makeFlagsArray=(PREFIX=$out LCOV_PERL_PATH=$(command -v perl))
''; '';
postInstall = ''
wrapProgram $out/bin/lcov --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.PerlIOgzip perlPackages.JSON ]}
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Code coverage tool that enhances GNU gcov"; description = "Code coverage tool that enhances GNU gcov";

15
pkgs/top-level/perl-packages.nix
View file

@ -14630,6 +14630,21 @@ let
}; };
}; };
PerlIOgzip = buildPerlPackage {
pname = "PerlIO-gzip";
version = "0.20";
src = fetchurl {
url = "mirror://cpan/authors/id/N/NW/NWCLARK/PerlIO-gzip-0.20.tar.gz";
sha256 = "4848679a3f201e3f3b0c5f6f9526e602af52923ffa471a2a3657db786bd3bdc5";
};
buildInputs = [ pkgs.zlib ];
NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz";
meta = {
description = "Perl extension to provide a PerlIO layer to gzip/gunzip";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
PerlIOutf8_strict = buildPerlPackage { PerlIOutf8_strict = buildPerlPackage {
pname = "PerlIO-utf8_strict"; pname = "PerlIO-utf8_strict";
version = "0.007"; version = "0.007";