Fix hpc for cross-compiled builds (#862)

* Add Hydra build products for test coverage reports (HTML links and zip files)

* Fix hpc on cross builds

Author: rvl

lib/cover-project.nix

@@ -60,9 +60,9 @@ let
   srcDirs = map (l: l.src.outPath) (projectLibs);
 
 in pkgs.runCommand "project-coverage-report"
-  ({ buildInputs = [ghc];
-     LANG        = "en_US.UTF-8";
-     LC_ALL      = "en_US.UTF-8";
+  ({ nativeBuildInputs = [ (ghc.buildGHC or ghc) pkgs.buildPackages.zip ];
+     LANG = "en_US.UTF-8";
+     LC_ALL = "en_US.UTF-8";
   } // lib.optionalAttrs (stdenv.buildPlatform.libc == "glibc") {
     LOCALE_ARCHIVE = "${pkgs.buildPackages.glibcLocales}/lib/locale/locale-archive";
   })
@@ -106,6 +106,7 @@ in pkgs.runCommand "project-coverage-report"
       popd
     }
 
+    mkdir -p $out/nix-support
     mkdir -p $out/share/hpc/vanilla/tix/all
     mkdir -p $out/share/hpc/vanilla/mix/
     mkdir -p $out/share/hpc/vanilla/html/
@@ -136,6 +137,7 @@ in pkgs.runCommand "project-coverage-report"
 
       # Markup a HTML coverage report for the entire project
       cp ${projectIndexHtml} $out/share/hpc/vanilla/html/index.html
+      echo "report coverage-per-package $out/share/hpc/vanilla/html/index.html" >> $out/nix-support/hydra-build-products
 
       local markupOutDir="$out/share/hpc/vanilla/html/all"
       local srcDirs=${toBashArray srcDirs}
@@ -146,5 +148,9 @@ in pkgs.runCommand "project-coverage-report"
       findModules allMixModules "$out/share/hpc/vanilla/mix/" "*.mix"
 
       markup srcDirs mixDirs allMixModules "$markupOutDir" "$tixFile"
+
+      echo "report coverage $markupOutDir/hpc_index.html" >> $out/nix-support/hydra-build-products
+      ( cd $out/share/hpc/vanilla/html ; zip -r $out/share/hpc/vanilla/html.zip . )
+      echo "file zip $out/share/hpc/vanilla/html.zip" >> $out/nix-support/hydra-build-products
     fi
   ''

lib/cover.nix

@@ -24,7 +24,7 @@ let
   srcDirs = map (l: l.src.outPath) mixLibraries;
 
 in pkgs.runCommand (name + "-coverage-report")
-  ({ buildInputs = [ ghc ];
+  ({nativeBuildInputs = [ (ghc.buildGHC or ghc) pkgs.buildPackages.zip ];
     passthru = {
       inherit name library checks;
     };
@@ -99,6 +99,7 @@ in pkgs.runCommand (name + "-coverage-report")
 
     local mixDirs=${toBashArray mixDirs}
 
+    mkdir -p $out/nix-support
     mkdir -p $out/share/hpc/vanilla/mix/${name}
     mkdir -p $out/share/hpc/vanilla/tix/${name}
     mkdir -p $out/share/hpc/vanilla/html/${name}
@@ -161,5 +162,10 @@ in pkgs.runCommand (name + "-coverage-report")
 
       # Markup a HTML report, included modules from only this package
       markup srcDirs mixDirs pkgMixModules "$markupOutDir" "$sumTixFile"
+
+      # Provide a HTML zipfile and Hydra links
+      ( cd "$markupOutDir" ; zip -r $out/share/hpc/vanilla/${name}-html.zip . )
+      echo "report coverage $markupOutDir/hpc_index.html" >> $out/nix-support/hydra-build-products
+      echo "file zip $out/share/hpc/vanilla/${name}-html.zip" >> $out/nix-support/hydra-build-products
     fi
   ''