fixup! Build without GHC environment files, instead using wrappers

Author: rvl

builder/with-package-wrapper.nix

@@ -66,6 +66,14 @@ in runCommand "${ghc.name}-with-${package.identifier.name}" {
       fi
     done
 
+    # Wrap haddock, if the base GHC provides it.
+    if [[ -x "${ghc}/bin/haddock" ]]; then
+      rm -f $out/bin/haddock
+      makeWrapper ${ghc}/bin/haddock $out/bin/haddock    \
+        --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"'  \
+        --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
+    fi
+
     # Point ghc-pkg to the package database of the component using the
     # --global-package-db flag.
 
@@ -75,13 +83,5 @@ in runCommand "${ghc.name}-with-${package.identifier.name}" {
         makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "--global-package-db=${packageCfgDir}"
       fi
     done
-
-    # fixme: check if this is needed
-    # haddock was referring to the base ghc, https://github.com/NixOS/nixpkgs/issues/36976
-    if [[ -x "${ghc}/bin/haddock" ]]; then
-      rm -f $out/bin/haddock
-      makeWrapper ${ghc}/bin/haddock $out/bin/haddock    \
-        --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
-    fi
   ''
 )