Merge branch 'main' into main

kieranjazy · web-flow · commit d5c539c532f4 · 2022-11-11T16:27:57.000Z
Signed-off-by: Kieran Jayes &lt;kieranjayes@hotmail.com&gt;
diff --git a/demos/chat-client/c++/README.md b/demos/chat-client/c++/README.md
@@ -1,2 +1,3 @@
 Compile to WASM first, then run with --wasmcfgfile directed to Enarx.toml
-Use the --webinterface argument in the Enarx.toml to switch to a web interface, at localhost:8080
+Use the --webinterface argument in the Enarx.toml to switch to a web interface, at localhost:8080
+
diff --git a/flake.nix b/flake.nix
@@ -108,7 +108,7 @@
         }
         ''
           mkdir -p "$out/bin"
-          $CXX -Wall -include ./demos/chat-client/c++/assets.h -pedantic ${demos.chat-client.cpp.src} \
+          $CXX -Wall -include "./demos/chat-client/c++/assets.h" -pedantic ${demos.chat-client.cpp.src} \
             -o "$out/bin/chat-client.wasm"
         '';
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@`
`108`	`108`	`}`
`109`	`109`	`''`
`110`	`110`	`mkdir -p "$out/bin"`
`111`		`- $CXX -Wall -include ./demos/chat-client/c++/assets.h -pedantic ${demos.chat-client.cpp.src} \`
	`111`	`+ $CXX -Wall -include "./demos/chat-client/c++/assets.h" -pedantic ${demos.chat-client.cpp.src} \`
`112`	`112`	`-o "$out/bin/chat-client.wasm"`
`113`	`113`	`'';`
`114`	`114`