Enable shared libs for wasm

Author: hamishmack

builder/comp-builder.nix

@@ -43,7 +43,7 @@ let self =
 , hardeningDisable ? component.hardeningDisable
 
 , enableStatic ? component.enableStatic
-, enableShared ? ghc.enableShared && component.enableShared && !haskellLib.isCrossHost
+, enableShared ? ghc.enableShared && component.enableShared && (!haskellLib.isCrossHost || stdenv.hostPlatform.isWasm)
 , enableExecutableDynamic ? component.enableExecutableDynamic && !stdenv.hostPlatform.isMusl
 , enableDeadCodeElimination ? component.enableDeadCodeElimination
 , writeHieFiles ? component.writeHieFiles

compiler/ghc/default.nix

@@ -39,7 +39,7 @@ let self =
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? !haskell-nix.haskellLib.isCrossTarget
+  enableShared ? !haskell-nix.haskellLib.isCrossTarget || stdenv.targetPlatform.isWasm
 
 , enableLibraryProfiling ? true
 

overlays/wasm.nix

@@ -46,7 +46,7 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.targetPlatform.isWasm {
       ({ pkgs, ... }: {
         testWrapper = ["HOME=$(mktemp -d)" (pkgs.pkgsBuildBuild.wasmtime + "/bin/wasmtime")];
         package-keys = ["clock"];
-        packages.clock.configureFlags = ["--ghc-option=-optc-Wno-int-conversion"];
+        packages.clock.ghcOptions = ["-optc-Wno-int-conversion"];
       })
     ];
   });