colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross: delete binfmt experiment (it will never work); comment out broken proot attempt

Browse Source
This commit is contained in:
Colin
2023-08-11 23:28:37 +00:00
parent dd53de96fe
commit 95d04467a8
1 changed files with 32 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
overlays/cross.nix
View File

@@ -156,60 +156,40 @@ let
# this is like binfmt, but configured to run *only* the emulated host and not the build machine # this is like binfmt, but configured to run *only* the emulated host and not the build machine
# see: <https://proot-me.github.io/> # see: <https://proot-me.github.io/>
# hinted at by: <https://www.tweag.io/blog/2022-03-31-running-wasm-native-hybrid-code/> # hinted at by: <https://www.tweag.io/blog/2022-03-31-running-wasm-native-hybrid-code/>
emulateBuilderProot = pkg: #
lib.overrideDerivation pkg ({ builder, args, ... }: { # this doesn't quite work:
builder = "${final.buildPackages.bash}/bin/sh"; # - proot'd aarch64 shell will launch child processes in qemu
args = [ "-e" prootBuilder ]; # - but those children won't launch their children in qemu
origBuilder = builder; # need to somehow recursively proot...
origArgs = args; # emulateBuilderProot = pkg:
# lib.overrideDerivation pkg ({ builder, args, ... }: {
# builder = "${final.buildPackages.bash}/bin/sh";
# args = [ "-e" prootBuilder ];
# origBuilder = builder;
# origArgs = args;
enableParallelBuilding = true; # TODO: inherit from `pkg`? # enableParallelBuilding = true; # TODO: inherit from `pkg`?
NIX_DEBUG = "6"; # NIX_DEBUG = "6";
# finally, let nix know that this package should be built by the build system # # finally, let nix know that this package should be built by the build system
system = final.stdenv.buildPlatform.system; # system = final.stdenv.buildPlatform.system;
}) // { # }) // {
override = attrs: emulateBuilderProot (pkg.override attrs); # override = attrs: emulateBuilderProot (pkg.override attrs);
overrideAttrs = mergeFn: emulateBuilderProot (pkg.overrideAttrs mergeFn); # overrideAttrs = mergeFn: emulateBuilderProot (pkg.overrideAttrs mergeFn);
}; # };
prootBuilder = let # prootBuilder = let
proot = "${final.buildPackages.proot}/bin/proot"; # proot = "${final.buildPackages.proot}/bin/proot";
# prootFlags = "-r / -b /:/"; # # prootFlags = "-r / -b /:/";
prootFlags = "-b /nix:/nix -b /tmp:/tmp"; # prootFlags = "-b /nix:/nix -b /tmp:/tmp";
# prootFlags = "-b /:/ -b ${final.bash}/bin/sh:/bin/sh"; # --mixed-mode false # # prootFlags = "-b /:/ -b ${final.bash}/bin/sh:/bin/sh"; # --mixed-mode false
qemu = "${final.buildPackages.qemu}/bin/qemu-aarch64"; # qemu = "${final.buildPackages.qemu}/bin/qemu-aarch64";
in # in
final.pkgs.writeText "proot-run" '' # final.pkgs.writeText "proot-run" ''
echo "proot: ${proot} -q ${qemu} ${prootFlags} $origBuilder $origArgs" # echo "proot: ${proot} -q ${qemu} ${prootFlags} $origBuilder $origArgs"
${proot} -q ${qemu} ${prootFlags} $origBuilder $origArgs # ${proot} -q ${qemu} ${prootFlags} $origBuilder $origArgs
echo "exited proot" # echo "exited proot"
''; # '';
emulateBuilderBinfmt = pkg:
lib.overrideDerivation pkg ({ builder, args, ...}: {
builder = "${final.buildPackages.bash}/bin/sh";
args = [ "-e" binfmtBuilder ];
origBuilder = builder;
origArgs = args;
# finally, let nix know that this package should be built by the build system
system = final.stdenv.buildPlatform.system;
}) // {
override = attrs: emulateBuilderBinfmt (pkg.override attrs);
overrideAttrs = mergeFn: emulateBuilderBinfmt (pkg.overrideAttrs mergeFn);
};
binfmtBuilder = let
sudo = "${final.buildPackages.sudo}/bin/sudo";
mount = "${final.buildPackages.util-linux.mount}/bin/mount";
in
final.pkgs.writeText "binfmt-run" ''
echo "binfmtBuilder: mounting binfmt_misc"
${sudo} ${mount} binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
echo "binfmtBuilder: running $origBuilder $origArgs"
$origBuilder $origArgs
'';
# given a package defined for build != host, transform it to build on the host. # given a package defined for build != host, transform it to build on the host.
# i.e. build using the host's stdenv. # i.e. build using the host's stdenv.
@@ -254,8 +234,7 @@ let
}); });
buildInQemu = pkg: emulateBuilderQemu (buildOnHost pkg); buildInQemu = pkg: emulateBuilderQemu (buildOnHost pkg);
buildInProot = pkg: emulateBuilderProot (buildOnHost pkg); # buildInProot = pkg: emulateBuilderProot (buildOnHost pkg);
buildInBinfmt = pkg: emulateBuilderBinfmt (buildOnHost pkg);
in { in {
inherit emulated; inherit emulated;