diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-29 21:01:24 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-23 21:48:57 -0400 |
| commit | 9abff4af4f07c16aecd89bf82051afbc3228d6fd (patch) | |
| tree | 7a8d8fe316db1636819a43a28192da740ea835c8 /pkgs/stdenv/cross | |
| parent | 6088a4793f2a83921b197a9185034934fcd96d02 (diff) | |
| download | nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.gz nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.bz2 nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.lz nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.xz nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.zst nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.zip | |
wasm: init cross target
Adds pkgsCross.wasm32 and pkgsCross.wasm64. Use it to build Nixpkgs with a WebAssembly toolchain. stdenv/cross: use static overlay on isWasm isWasm doesn’t make sense dynamically linked.
Diffstat (limited to 'pkgs/stdenv/cross')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index fc9a585cf4d..479213f3a56 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -37,7 +37,8 @@ in lib.init bootStages ++ [ # Run Packages (buildPackages: { inherit config; - overlays = overlays ++ crossOverlays; + overlays = overlays ++ crossOverlays + ++ (if crossSystem.isWasm then [(import ../../top-level/static.nix)] else []); selfBuild = false; stdenv = buildPackages.stdenv.override (old: rec { buildPlatform = localSystem; |