From 08b12f6385b3ed72061891bbdf480278b41491d8 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 27 Aug 2020 22:00:49 +0200 Subject: [PATCH] lcov: 1.14 -> 1.15 --- .../tools/analysis/lcov/default.nix | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 6ac778180b77..c6faeaa72f23 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -1,24 +1,16 @@ - {stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper }: + {stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "lcov-1.14"; + pname = "lcov"; + version = "1.15"; - src = fetchurl { - url = "mirror://sourceforge/ltp/${name}.tar.gz"; - sha256 = "06h7ixyznf6vz1qvksjgy5f3q2nw9akf6zx59npf0h3l32cmd68l"; + src = fetchFromGitHub { + owner = "linux-test-project"; + repo = "lcov"; + rev = "v${version}"; + sha256 = "1kvc7fkp45w48f0bxwbxvxkicnjrrydki0hllg294n1wrp80zzyk"; }; - patches = - [ (fetchpatch { - url = "https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7.patch"; - sha256 = "0dalkqbjb6a4vp1lcsxd39dpn5fzdf7ihsjbiviq285s15nxdj1j"; - }) - (fetchpatch { - url = "https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da.patch"; - sha256 = "0v1hn0511dxqbf50ppwasc6vmg0m6rns7ydbdy2rdbn0j7gxw30x"; - }) - ]; - buildInputs = [ perl makeWrapper ]; preBuild = '' @@ -28,6 +20,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/lcov --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.PerlIOgzip perlPackages.JSON ]} + wrapProgram $out/bin/genpng --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.GD ]} ''; meta = with stdenv.lib; {