From 316893af057fa49a2836aff6040a0e6556a647d4 Mon Sep 17 00:00:00 2001 From: Jeremy Runyan Date: Sat, 8 May 2021 20:26:26 -0400 Subject: [PATCH] try crosspkgs as arg --- Makefile | 1 + helios64.nix | 12 +++--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 803a0c6..1cffdeb 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ system: configuration.nix helios64.nix image: emmc-image.nix configuration.nix helios64.nix nix-build '' \ + --arg crossSystem '(import {}).lib.systems.examples.aarch64-multiplatform' \ --arg configuration ./emmc-image.nix \ -A config.system.build.sdImage \ -I nixpkgs=$(NIXPKGS) \ diff --git a/helios64.nix b/helios64.nix index 023c71e..39b4dff 100644 --- a/helios64.nix +++ b/helios64.nix @@ -1,12 +1,6 @@ -{ config, pkgs, lib, ... }: -let -# crossPkgs = import pkgs.path { system = "x86_64-linux"; crossSystem = "aarch64-linux"; }; - pkgs = import { - crossSystem = { - config = "aarch64-unknown-linux-gnu"; - }; - }; -in { +{ pkgs, lib, ... }: + +{ # Fan speed adjustment systemd.services.fans = { wantedBy = ["multi-user.target"];