Add project.buildProject (#1265)

* Add project.buildProject This exposes the project used by `buildModules`. * Update overlays/haskell.nix Co-authored-by: Jean-Baptiste Giraudeau <jean-baptiste.giraudeau@iohk.io> * Update overlays/haskell.nix Co-authored-by: Jean-Baptiste Giraudeau <jean-baptiste.giraudeau@iohk.io> * Fix syntax error Co-authored-by: Jean-Baptiste Giraudeau <jean-baptiste.giraudeau@iohk.io>
input-output-hk · Oct 11, 2021 · 2b5ad5a · 2b5ad5a
1 parent 9abb33b
commit 2b5ad5a
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/overlays/haskell.nix b/overlays/haskell.nix
@@ -488,6 +488,9 @@ final: prev: {
               plan-pkgs = importAndFilterProject {
                 inherit (callProjectResults) projectNix sourceRepos src;
               };
+              buildProject = if final.stdenv.hostPlatform != final.stdenv.buildPlatform
+                then final.buildPackages.haskell-nix.cabalProject' projectModule
+                else project;
               pkg-set = if plan-pkgs ? configurationError
                 then {
                   inherit (plan-pkgs) configurationError;
@@ -499,9 +502,7 @@ final: prev: {
                 else mkCabalProjectPkgSet
                 { inherit compiler-nix-name plan-pkgs;
                   pkg-def-extras = args.pkg-def-extras or [];
-                  modules = [ { _module.args.buildModules = final.lib.mkForce (if final.stdenv.hostPlatform != final.stdenv.buildPlatform
-                      then (final.buildPackages.haskell-nix.cabalProject' projectModule).pkg-set
-                      else pkg-set); } ]
+                  modules = [ { _module.args.buildModules = final.lib.mkForce buildProject.pkg-set; } ]
                     ++ (args.modules or [])
                     ++ final.lib.optional (args.ghcOverride != null || args.ghc != null)
                         { ghc.package = if args.ghcOverride != null then args.ghcOverride else args.ghc; }
@@ -518,7 +519,7 @@ final: prev: {
                   tools = final.buildPackages.haskell-nix.tools pkg-set.config.compiler.nix-name;
                   roots = final.haskell-nix.roots pkg-set.config.compiler.nix-name;
                   projectFunction = haskell-nix: haskell-nix.cabalProject';
-                  inherit projectModule args;
+                  inherit projectModule buildProject args;
                 };
             in project);
 
@@ -771,12 +772,14 @@ final: prev: {
                   // final.lib.optionalAttrs (args.cache == null) { inherit cache; });
                 generatedCache = genStackCache args;
                 cache = if args.cache != null then args.cache else generatedCache;
-            in let pkg-set = mkStackPkgSet
+            in let
+              buildProject = if final.stdenv.hostPlatform != final.stdenv.buildPlatform
+                then final.buildPackages.haskell-nix.stackProject' projectModule
+                else project;
+              pkg-set = mkStackPkgSet
                 { stack-pkgs = importAndFilterProject callProjectResults;
                   pkg-def-extras = (args.pkg-def-extras or []);
-                  modules = [ { _module.args.buildModules = final.lib.mkForce (if final.stdenv.hostPlatform != final.stdenv.buildPlatform
-                      then (final.buildPackages.haskell-nix.stackProject' projectModule).pkg-set
-                      else pkg-set); }
+                  modules = [ { _module.args.buildModules = final.lib.mkForce buildProject.pkg-set; }
                       (mkCacheModule cache) ]
                     ++ (args.modules or [])
                     ++ final.lib.optional (args.ghc != null) { ghc.package = args.ghc; }
@@ -792,7 +795,7 @@ final: prev: {
                   tools = final.buildPackages.haskell-nix.tools pkg-set.config.compiler.nix-name;
                   roots = final.haskell-nix.roots pkg-set.config.compiler.nix-name;
                   projectFunction = haskell-nix: haskell-nix.stackProject';
-                  inherit projectModule args;
+                  inherit projectModule buildProject args;
                 };
             in project);