Attempt at getting cross-compilation working.

This commit is contained in:
Elliot Glaysher 2019-06-24 14:41:54 -07:00
parent 3af13630cf
commit 44ddebdb4f
2 changed files with 9 additions and 5 deletions

View File

@ -1,6 +1,6 @@
{ env_name, env, deps }:
{ ent, name ? "urbit", debug ? false }:
{ ent, ge-additions, name ? "urbit", debug ? false }:
let
@ -10,7 +10,7 @@ let
vendor =
with deps;
[ argon2 softfloat3 ed25519 h2o scrypt uv murmur3 secp256k1 sni ];
[ argon2 softfloat3 ed25519 ge-additions h2o scrypt uv murmur3 secp256k1 sni ];
in

View File

@ -16,16 +16,20 @@ let
ent = env:
import ./pkgs/ent/cross.nix env;
ge-additions = env:
import ./pkgs/ge-additions/cross.nix env;
urbit = env:
import ./pkgs/urbit/release.nix env
{ ent = ent env; debug = false; name = "urbit"; };
{ ent = ent env; ge-additions = ge-additions env; debug = false; name = "urbit"; };
builds-for-platform = plat:
plat.deps // {
inherit (plat.env) curl libgmp libsigsegv ncurses openssl zlib lmdb;
inherit (plat.env) cmake_toolchain;
ent = ent plat;
urbit = urbit plat;
ent = ent plat;
ge-additions = ge-additions plat;
urbit = urbit plat;
};
darwin_extra = {