File tree Expand file tree Collapse file tree 2 files changed +15
-2
lines changed Expand file tree Collapse file tree 2 files changed +15
-2
lines changed Original file line number Diff line number Diff line change 281
281
if builtins . isFunction shellHook then shellHook { inherit package shellWrappers ; }
282
282
else abort "shellHook should be a string or a function" ;
283
283
284
- exeExt = if stdenv . hostPlatform . isGhcjs && builtins . compareVersions defaults . ghc . version "9.8" < 0
285
- then ".jsexe/all.js"
284
+ exeExt =
285
+ if stdenv . hostPlatform . isWasm
286
+ then ".wasm"
287
+ else if stdenv . hostPlatform . isGhcjs && builtins . compareVersions defaults . ghc . version "9.8" < 0
288
+ then ".jsexe/all.js"
286
289
else stdenv . hostPlatform . extensions . executable ;
287
290
exeName = componentId . cname + exeExt ;
288
291
testExecutable = "dist/build/${ componentId . cname } /${ exeName } " ;
Original file line number Diff line number Diff line change @@ -40,4 +40,14 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.targetPlatform.isWasm {
40
40
'' ;
41
41
nativeBuildInputs = old . nativeBuildInputs or [ ] ++ [ final . buildPackages . lld ] ;
42
42
} ) ;
43
+
44
+ haskell-nix = prev . haskell-nix // ( {
45
+ defaultModules = prev . haskell-nix . defaultModules ++ [
46
+ ( { pkgs , ... } : {
47
+ testWrapper = [ "HOME=$(mktemp -d)" ( pkgs . pkgsBuildBuild . wasmtime + "/bin/wasmtime" ) ] ;
48
+ package-keys = [ "clock" ] ;
49
+ packages . clock . configureFlags = [ "--ghc-option=-optc-Wno-int-conversion" ] ;
50
+ } )
51
+ ] ;
52
+ } ) ;
43
53
}
You can’t perform that action at this time.
0 commit comments