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/generic | |
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/generic')
-rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 04117de3269..ed022422c26 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -91,6 +91,9 @@ let '' + lib.optionalString hostPlatform.isDarwin '' export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 + '' + lib.optionalString (hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.elf && hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.macho) '' + export NIX_DONT_SET_RPATH=1 + export NIX_NO_SELF_RPATH=1 '' # TODO this should be uncommented, but it causes stupid mass rebuilds. I # think the best solution would just be to fixup linux RPATHs so we don't |