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

remove dead binfmt code

Browse Source
This commit is contained in:
Colin
2024-03-10 01:05:33 +00:00
parent df33576090
commit ce8c4a4f6f
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hosts/common/hardware/default.nix
View File

@@ -79,11 +79,6 @@
HandleLidSwitch=lock HandleLidSwitch=lock
''; '';
# some packages build only if binfmt *isn't* present
nix.settings.system-features = lib.mkIf (config.boot.binfmt.emulatedSystems == []) [
"no-binfmt"
];
# services.snapper.configs = { # services.snapper.configs = {
# root = { # root = {
# subvolume = "/"; # subvolume = "/";

1
hosts/modules/nixcache.nix
View File

@@ -91,7 +91,6 @@ in
speedFactor = 2; speedFactor = 2;
supportedFeatures = [ supportedFeatures = [
# "big-parallel" # it can't reliably build webkitgtk # "big-parallel" # it can't reliably build webkitgtk
"no-binfmt"
]; ];
mandatoryFeatures = [ ]; mandatoryFeatures = [ ];
sshUser = "nixremote"; sshUser = "nixremote";

11
hosts/modules/roles/build-machine.nix
View File

@@ -11,10 +11,6 @@ in
type = types.bool; type = types.bool;
default = false; default = false;
}; };
emulation = mkOption {
type = types.bool;
default = false;
};
ccache = mkOption { ccache = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@@ -37,13 +33,6 @@ in
nix.settings.system-features = [ "big-parallel" ]; nix.settings.system-features = [ "big-parallel" ];
# enable cross compilation
# TODO: do this via stdenv injection, linking into /run/binfmt the stuff in <nixpkgs:nixos/modules/system/boot/binfmt.nix>
boot.binfmt.emulatedSystems = lib.optionals cfg.emulation [
"aarch64-linux"
# "aarch64-darwin" # not supported
# "x86_64-darwin" # not supported
];
# corresponds to env var: NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 # corresponds to env var: NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1
# nixpkgs.config.allowUnsupportedSystem = true; # nixpkgs.config.allowUnsupportedSystem = true;
}) })