diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-23 22:44:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 22:44:33 -0400 |
| commit | 7488a367af199dc61992bdd3451a4016bb0f0f5f (patch) | |
| tree | d93c0db58acb5c29c8cf6b73998e8cdcfb2e1396 /pkgs/stdenv/generic | |
| parent | 84d00355e8b288a0700ea1590897b75297ec3877 (diff) | |
| parent | 008c9a70a57f0448b275179bfbc10c8750f29069 (diff) | |
| download | nixpkgs-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar nixpkgs-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar.gz nixpkgs-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar.bz2 nixpkgs-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar.lz nixpkgs-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar.xz nixpkgs-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar.zst nixpkgs-7488a367af199dc61992bdd3451a4016bb0f0f5f.zip | |
Merge pull request #56555 from matthewbauer/wasm
Initial WebAssembly/WASI cross-compilation support
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 04117de3269..1ef2ab52029 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -88,7 +88,7 @@ let # there (yet?) so it goes here until then. preHook = preHook+ lib.optionalString buildPlatform.isDarwin '' export NIX_BUILD_DONT_SET_RPATH=1 - '' + lib.optionalString hostPlatform.isDarwin '' + '' + lib.optionalString (hostPlatform.isDarwin || (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 '' |