Avoid genprimops build failure

input-output-hk · Mar 17, 2023 · 5bda52d · 5bda52d
1 parent 122e3bf
commit 5bda52d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/compiler/ghc/default.nix b/compiler/ghc/default.nix
@@ -250,11 +250,11 @@ let
   # For build flavours and flavour transformers
   # see https://gitlab.haskell.org/ghc/ghc/blob/master/hadrian/doc/flavours.md
   hadrianArgs = "--flavour=${
-        "default"
+        (if targetPlatform.isGhcjs then "quick" else "default")
           + lib.optionalString (!enableShared) "+no_dynamic_ghc"
           + lib.optionalString useLLVM "+llvm"
           + lib.optionalString targetPlatform.isGhcjs "+native_bignum+no_profiled_libs"
-      } --docs=no-sphinx -j --verbose";
+      } --docs=${if targetPlatform.isGhcjs then "none" else "no-sphinx"} -j --verbose";
 
   # When installation is done by copying the stage1 output the directory layout
   # is different.
@@ -639,7 +639,7 @@ stdenv.mkDerivation (rec {
   '';
   buildPhase = ''
     ${hadrian}/bin/hadrian ${hadrianArgs}
-  '' + lib.optionalString installStage1 ''
+  '' + lib.optionalString (installStage1 && !stdenv.targetPlatform.isGhcjs) ''
     ${hadrian}/bin/hadrian ${hadrianArgs} stage1:lib:libiserv
   '' + lib.optionalString targetPlatform.isMusl ''
     ${hadrian}/bin/hadrian ${hadrianArgs} stage1:lib:terminfo

diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix
@@ -185,7 +185,7 @@ in {
                 ++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.4.1"  "9.5"    ./patches/ghc/ghc-9.4-hadrian-win-cross.patch)
                 ++ fromUntil "9.6.1"  "9.8"    ./patches/ghc/MR10116.patch
                 ++ fromUntil "9.4.1"  "9.6"    ./patches/ghc/hadrian-build-deriveConstants-genprimopcode-ghc94.patch
-                ++ fromUntil "9.6.1"  "9.8"    ./patches/ghc/hadrian-build-deriveConstants-genprimopcode.patch
+                ++ final.lib.optionals (!final.stdenv.targetPlatform.isGhcjs) (fromUntil "9.6.1" "9.8"      ./patches/ghc/hadrian-build-deriveConstants-genprimopcode.patch)
                 ++ final.lib.optionals (final.stdenv.targetPlatform.isGhcjs) (fromUntil "9.6.1"  "9.6.2"    ./patches/ghc/ghc-9.6-Merge-libiserv-with-ghci.patch)
                 ++ final.lib.optionals (final.stdenv.targetPlatform.isGhcjs) (fromUntil "9.6.1"  "9.6.2"    ./patches/ghc/ghc-9.6-Assorted-changes-to-avoid-head-tail.patch)
                 ++ final.lib.optionals (final.stdenv.targetPlatform.isGhcjs) (fromUntil "9.6.1"  "9.6.2"    ./patches/ghc/ghc-9.6-JS-implement-TH-support.patch)