From 08d7136a2e3150dd898cf2d2d3756801dfb407bd Mon Sep 17 00:00:00 2001 From: sefidel Date: Wed, 15 Feb 2023 14:32:53 +0900 Subject: feat(nixos/kompakt): use flakes for asahi-related dependencies Imports are done directly inside the system configuration file to ensure one doesn't forget to import the required modules. --- .../packages/uboot-asahi/default.nix | 54 ---------------------- 1 file changed, 54 deletions(-) delete mode 100644 nixos/modules/apple-silicon-support/packages/uboot-asahi/default.nix (limited to 'nixos/modules/apple-silicon-support/packages/uboot-asahi') diff --git a/nixos/modules/apple-silicon-support/packages/uboot-asahi/default.nix b/nixos/modules/apple-silicon-support/packages/uboot-asahi/default.nix deleted file mode 100644 index d912631..0000000 --- a/nixos/modules/apple-silicon-support/packages/uboot-asahi/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, buildUBoot -, m1n1 -}: - -(buildUBoot rec { - src = fetchFromGitHub { - # tracking: https://github.com/AsahiLinux/PKGBUILDs/blob/stable/uboot-asahi/PKGBUILD - owner = "AsahiLinux"; - repo = "u-boot"; - rev = "asahi-v2022.10-1"; - hash = "sha256-/dtTJ+GxC2GFlqduAa2WWPGwktLjM7tUKus6/aUyPNQ="; - }; - version = "2022.10.asahi1-1"; - - defconfig = "apple_m1_defconfig"; - extraMeta.platforms = [ "aarch64-linux" ]; - filesToInstall = [ - "u-boot-nodtb.bin.gz" - "m1n1-u-boot.bin" - ]; - extraConfig = '' - CONFIG_IDENT_STRING=" ${version}" - CONFIG_VIDEO_FONT_4X6=n - CONFIG_VIDEO_FONT_8X16=n - CONFIG_VIDEO_FONT_SUN12X22=n - CONFIG_VIDEO_FONT_TER12X24=n - CONFIG_VIDEO_FONT_TER16X32=y - ''; -}).overrideAttrs (o: { - # nixos's downstream patches are not applicable - # however, we add in bigger u-boot fonts because the mac laptop screens are high-res - patches = [ - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/testing/u-boot-asahi/apritzel-first5-video.patch?id=990110f35b50b74bdb4e902d94fa15b07a8eac9e"; - sha256 = "sha256-QPvJYxIcQBHbwsj7l96qGUZSipk1sB3ZyniD1Io18dY="; - revert = false; - }) - - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/testing/u-boot-asahi/mps-u-boot-ter12x24.patch?id=990110f35b50b74bdb4e902d94fa15b07a8eac9e"; - sha256 = "sha256-wrQpIYiuNRi/p2p290KCGPmuRxFEOPlbICoFvd+E8p0="; - revert = false; - }) - ]; - - preInstall = '' - # compress so that m1n1 knows U-Boot's size and can find things after it - gzip -n u-boot-nodtb.bin - cat ${m1n1}/build/m1n1.bin arch/arm/dts/t[68]*.dtb u-boot-nodtb.bin.gz > m1n1-u-boot.bin - ''; -}) -- cgit 1.4.1