diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-07 14:25:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 14:25:33 -0400 |
| commit | 424f467e06daa3363581ebef8ea354dbbfeb3cf5 (patch) | |
| tree | 75bb2748bbb37e88cf2c80732caf8b5202aab8ee /pkgs/stdenv/cross | |
| parent | 5a69a4ecc1650e7989a39146a598bb6d97837a3f (diff) | |
| parent | 929fe5ca2129d257b20d2cb22e195f8ed8cda9e8 (diff) | |
| download | nixpkgs-424f467e06daa3363581ebef8ea354dbbfeb3cf5.tar nixpkgs-424f467e06daa3363581ebef8ea354dbbfeb3cf5.tar.gz nixpkgs-424f467e06daa3363581ebef8ea354dbbfeb3cf5.tar.bz2 nixpkgs-424f467e06daa3363581ebef8ea354dbbfeb3cf5.tar.lz nixpkgs-424f467e06daa3363581ebef8ea354dbbfeb3cf5.tar.xz nixpkgs-424f467e06daa3363581ebef8ea354dbbfeb3cf5.tar.zst nixpkgs-424f467e06daa3363581ebef8ea354dbbfeb3cf5.zip | |
Merge branch 'master' into update-ios-gnu-config
Diffstat (limited to 'pkgs/stdenv/cross')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 2b64604c066..3bc4cd9a8fa 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; @@ -63,7 +64,7 @@ in lib.init bootStages ++ [ (hostPlatform.isLinux && !buildPlatform.isLinux) [ buildPackages.patchelf ] ++ lib.optional - (let f = p: !p.isx86 || p.libc == "musl" || p.isiOS; in f hostPlatform && !(f buildPlatform)) + (let f = p: !p.isx86 || p.libc == "musl" || p.libc == "wasilibc" || p.isiOS; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs |