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

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

pkgs/build-support/release/default.nix

@@ -11,7 +11,6 @@ rec {
 
   nixBuild = args: import ./nix-build.nix (
     { inherit stdenv;
-      doCoverageAnalysis = false;
     } // args);
 
   coverageAnalysis = args: nixBuild (

pkgs/build-support/release/make-source-tarball.nix

@@ -5,7 +5,7 @@
 { officialRelease ? false
 , buildInputs ? []
 , src, stdenv, autoconf, automake, libtool
-, ...} @ args:
+, ... } @ args:
 
 let
 

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}";
     };