* Always include "/nix/store/*" in lcovFilter.

svn path=/nixpkgs/trunk/; revision=13583

1 files changed, 7 insertions, 3 deletions

diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 5257c2c74249..5f127265d4a8 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -5,7 +5,10 @@
 # it turns on GCC's coverage analysis feature.  It then runs `make
 # check' and produces a coverage analysis report using `lcov'.
 
-args: with args;
+{ doCoverageAnalysis ? false
+, lcovFilter ? []
+, src, stdenv
+, ... } @ args:
 
 stdenv.mkDerivation (
 
@@ -20,8 +23,6 @@ stdenv.mkDerivation (
 
     showBuildStats = true;
 
-    lcovFilter = ["/nix/store/*"];
-
     # Hack - swap checkPhase and installPhase (otherwise Stratego barfs).
     phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase ${if doCoverageAnalysis then "coverageReportPhase" else ""}";
   }
@@ -83,6 +84,9 @@ stdenv.mkDerivation (
     '' else "";
 
 
+    lcovFilter = ["/nix/store/*"] ++ lcovFilter;
+    
+
     meta = (if args ? meta then args.meta else {}) // {
       description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}";
     };