From 398c07ea9f9d7092c6ac048e259f709168b4e511 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 4 Feb 2023 11:39:16 +0000 Subject: [PATCH] WIP: moby-cross: is cross-by-default instead of opt-in --- flake.nix | 3 +++ hosts/by-name/moby/default.nix | 5 ++++- hosts/common/programs.nix | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 6b58066eb..70237789f 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,9 @@ self.overlays.passthru self.overlays.pins ]; + # nixpkgs.crossSystem = target; + nixpkgs.hostPlatform = target; + nixpkgs.buildPlatform = local; } ]; }); diff --git a/hosts/by-name/moby/default.nix b/hosts/by-name/moby/default.nix index 9d454f482..293fb6270 100644 --- a/hosts/by-name/moby/default.nix +++ b/hosts/by-name/moby/default.nix @@ -10,6 +10,9 @@ sane.services.wg-home.enable = true; sane.services.wg-home.ip = config.sane.hosts.by-name."moby".wg-home.ip; + # TODO: re-enable once base is cross-compiled + sane.programs.phoshApps.enableSuggested = false; + # cross-compiled documentation is *slow*. # no obvious way to natively compile docs (2022/09/29). # entrypoint is nixos/modules/misc/documentation.nix @@ -43,7 +46,7 @@ sane.nixcache.enable = true; sane.persist.enable = true; - sane.gui.phosh.enable = true; + # sane.gui.phosh.enable = true; boot.loader.efi.canTouchEfiVariables = false; # /boot space is at a premium. default was 20. diff --git a/hosts/common/programs.nix b/hosts/common/programs.nix index c5622da14..217f76c41 100644 --- a/hosts/common/programs.nix +++ b/hosts/common/programs.nix @@ -53,12 +53,12 @@ let consolePkgs = { inherit (pkgs) backblaze-b2 - cdrtools + # cdrtools # TODO: fix for cross compilation dmidecode duplicity efivar flashrom - fwupd + # fwupd # TODO: fix for cross compilation ghostscript # TODO: imagemagick wrapper should add gs to PATH gnupg gocryptfs