From 776cea6c0120eb296a9b2f7c011e3c628f36d5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 5 Jun 2024 10:10:05 +0300 Subject: [PATCH] disable crossNative https://discourse.nixos.org/t/24-05-unable-to-build-bash-and-thus-almost-anything-on-aarch64-linux/46513/5?u=motiejus --- shared/platform/orangepi5plus.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/shared/platform/orangepi5plus.nix b/shared/platform/orangepi5plus.nix index 3b726e6..a220064 100644 --- a/shared/platform/orangepi5plus.nix +++ b/shared/platform/orangepi5plus.nix @@ -4,15 +4,16 @@ pkgs, modulesPath, ... -}: let - #crossFast = pkgs.crossArm64.pkgsCross.aarch64-multiplatform; - crossNative = pkgs.pkgsCross.aarch64-multiplatform; -in { +}: +#let +#crossFast = pkgs.crossArm64.pkgsCross.aarch64-multiplatform; +#in +{ mj.skipPerf = true; boot = { #kernelPackages = crossNative.linuxPackagesFor (crossFast.buildLinux rec { - kernelPackages = crossNative.linuxPackagesFor (crossNative.buildLinux rec { + kernelPackages = pkgs.linuxPackagesFor (pkgs.buildLinux rec { version = "6.9.0-rc1"; modDirVersion = "6.9.0-rc1"; @@ -59,6 +60,6 @@ in { inherit config lib pkgs; }; #uboot = crossFast.callPackage ../../hacks/orangepi5plus/uboot {}; - uboot = crossNative.callPackage ../../hacks/orangepi5plus/uboot {}; + uboot = pkgs.callPackage ../../hacks/orangepi5plus/uboot {}; }; }