diff --git a/build-wasm-app.nix b/build-wasm-app.nix index 5bbc8f9..19c38a8 100644 --- a/build-wasm-app.nix +++ b/build-wasm-app.nix @@ -26,6 +26,7 @@ let in { ename, pkg, assets ? [], scripts ? [], styles ? [] }: runCommand "wasm-app-${ename}" { nativeBuildInputs = [ buildPackages.xorg.lndir buildPackages.binaryen ]; passthru = { inherit pkg; }; + meta.platforms = ["wasm32-unknown"]; } '' mkdir -p $out lndir ${buildPackages.webabi}/lib/node_modules/webabi/build $out diff --git a/default.nix b/default.nix index d154f37..53c7188 100644 --- a/default.nix +++ b/default.nix @@ -24,7 +24,13 @@ ''; build-wasm-app = self.callPackage ./build-wasm-app.nix {}; + + # Issue happens when combining pkgsStatic & custom cross stdenv. + # We need to force a normal busybox here to avoid hitting a + # weird bootstrapping issue. + busybox-sandbox-shell = super.busybox-sandbox-shell.override { busybox = self.busybox; }; })] ++ overlays; + config = { allowUnsupportedSystem = true; }; }; nixpkgsCrossArgs = project.nixpkgsArgs // { stdenvStages = import ./cross.nix haskellProfiling; diff --git a/release.nix b/release.nix index 1e980f0..3c08a10 100644 --- a/release.nix +++ b/release.nix @@ -8,7 +8,7 @@ let inherit (pkgs) musl-cross; fib-example = pkgs.fib-example.pkg; hello-example = pkgs.hello-example.pkg; - inherit (pkgs.haskell.packages.integer-simple.ghc863) hello ghc; + inherit (pkgs.haskell.packages.integer-simple.ghc865) hello ghc; }; in { inherit (nixpkgs.llvmPackages_HEAD) llvm clang clang-unwrapped compiler-rt