diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index e26c9d7e88b8..e3ea97876f46 100644 --- a/pkgs/build-support/release/default.nix +++ b/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 ( diff --git a/pkgs/build-support/release/make-source-tarball.nix b/pkgs/build-support/release/make-source-tarball.nix index 3a5123ce3f84..806246db7945 100644 --- a/pkgs/build-support/release/make-source-tarball.nix +++ b/pkgs/build-support/release/make-source-tarball.nix @@ -5,7 +5,7 @@ { officialRelease ? false , buildInputs ? [] , src, stdenv, autoconf, automake, libtool -, ...} @ args: +, ... } @ args: let 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}"; };