diff options
| author | Aaron Janse <aaron@ajanse.me> | 2020-07-21 13:11:36 -0700 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:27:27 +0000 |
| commit | 264f67859c87de433106ff97d00151b79dabc5ed (patch) | |
| tree | aaf1eae2da47ad38063725dcd9764f85c8af9621 /nixpkgs/pkgs/stdenv/cross | |
| parent | b17052ae9306cad34fd83bfe1f4f830d171052d4 (diff) | |
| download | nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar.gz nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar.bz2 nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar.lz nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar.xz nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar.zst nixlib-264f67859c87de433106ff97d00151b79dabc5ed.zip | |
redox: add as target
(cherry picked from commit 60fd049b6552d73a5162109e7d8aa0839b54c398)
Diffstat (limited to 'nixpkgs/pkgs/stdenv/cross')
| -rw-r--r-- | nixpkgs/pkgs/stdenv/cross/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/stdenv/cross/default.nix b/nixpkgs/pkgs/stdenv/cross/default.nix index cc49af7de3b5..0f575289889f 100644 --- a/nixpkgs/pkgs/stdenv/cross/default.nix +++ b/nixpkgs/pkgs/stdenv/cross/default.nix @@ -38,7 +38,7 @@ in lib.init bootStages ++ [ (buildPackages: { inherit config; overlays = overlays ++ crossOverlays - ++ (if crossSystem.isWasm then [(import ../../top-level/static.nix)] else []); + ++ (if (with crossSystem; isWasm || isRedox) then [(import ../../top-level/static.nix)] else []); selfBuild = false; stdenv = buildPackages.stdenv.override (old: rec { buildPlatform = localSystem; @@ -72,7 +72,7 @@ in lib.init bootStages ++ [ (hostPlatform.isLinux && !buildPlatform.isLinux) [ buildPackages.patchelf ] ++ lib.optional - (let f = p: !p.isx86 || p.libc == "musl" || p.libc == "wasilibc" || p.isiOS; in f hostPlatform && !(f buildPlatform)) + (let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs |