From 32dcf4e9dd49b7924cca9a02333ba89dc7696287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 5 Jun 2024 10:11:53 +0300 Subject: [PATCH] Revert "disable crossNative" This reverts commit 776cea6c0120eb296a9b2f7c011e3c628f36d5a2. --- shared/platform/orangepi5plus.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/shared/platform/orangepi5plus.nix b/shared/platform/orangepi5plus.nix index a220064..3b726e6 100644 --- a/shared/platform/orangepi5plus.nix +++ b/shared/platform/orangepi5plus.nix @@ -4,16 +4,15 @@ pkgs, modulesPath, ... -}: -#let -#crossFast = pkgs.crossArm64.pkgsCross.aarch64-multiplatform; -#in -{ +}: let + #crossFast = pkgs.crossArm64.pkgsCross.aarch64-multiplatform; + crossNative = pkgs.pkgsCross.aarch64-multiplatform; +in { mj.skipPerf = true; boot = { #kernelPackages = crossNative.linuxPackagesFor (crossFast.buildLinux rec { - kernelPackages = pkgs.linuxPackagesFor (pkgs.buildLinux rec { + kernelPackages = crossNative.linuxPackagesFor (crossNative.buildLinux rec { version = "6.9.0-rc1"; modDirVersion = "6.9.0-rc1"; @@ -60,6 +59,6 @@ inherit config lib pkgs; }; #uboot = crossFast.callPackage ../../hacks/orangepi5plus/uboot {}; - uboot = pkgs.callPackage ../../hacks/orangepi5plus/uboot {}; + uboot = crossNative.callPackage ../../hacks/orangepi5plus/uboot {}; }; }