Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix busybox failure #33

Closed
wants to merge 4 commits into from
Closed

Fix busybox failure #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3736dc4
Add busybox-sandbox-shell override
matthewbauer Dec 2, 2019
f317e2c
build-wasm-app only works on wasm32
matthewbauer Dec 2, 2019
02aaae7
Allow unsupported system in nixpkgs config
matthewbauer Dec 2, 2019
aab736a
ghc863 -> ghc865
matthewbauer Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build-wasm-app.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

allowUnsupportedSystem doesn't seem right....

Copy link
Contributor Author

@matthewbauer matthewbauer Dec 6, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The alternative is to add wasm32-unknown to systems/doubles.nix here: https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix. I'd like to avoid it though since wasm32-unknown-unknown is not actively maintained (https://github.com/jfbastien/musl has been archived). Switching to wasm32-unknown-wasi should also make this unnecessary.

};
nixpkgsCrossArgs = project.nixpkgsArgs // {
stdenvStages = import ./cross.nix haskellProfiling;
Expand Down
2 changes: 1 addition & 1 deletion release.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down