diff options
| author | Karel Kočí <cynerd@email.cz> | 2025-09-29 14:45:23 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2025-09-29 14:45:23 +0200 |
| commit | 7606d67ed1dc56b5b5f05b6423f7a5e81db05151 (patch) | |
| tree | 50f8739567c66df05a7fd2273cb4e43675875481 /pkgs/default.nix | |
| parent | 141932e06ba0bc3a5a561bd9594651079dea70f7 (diff) | |
| download | nixos-personal-7606d67ed1dc56b5b5f05b6423f7a5e81db05151.tar.gz nixos-personal-7606d67ed1dc56b5b5f05b6423f7a5e81db05151.tar.bz2 nixos-personal-7606d67ed1dc56b5b5f05b6423f7a5e81db05151.zip | |
Diffstat (limited to 'pkgs/default.nix')
| -rw-r--r-- | pkgs/default.nix | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index 10bb325..f80464b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -40,14 +40,30 @@ final: prev: { (final.buildUBoot { defconfig = "mt7981_openwrt-one-spi-nand_defconfig"; extraMeta.platforms = ["aarch64-linux"]; - BL31 = "${final.armTrustedFirmwareMT7981}/bl31.elf"; - filesToInstall = ["u-boot.bin"]; + filesToInstall = ["u-boot.fip" ".config"]; extraPatches = [./u-boot-add-openwrt-one.patch]; extraConfig = '' - CONFIG_FS_BTRFS=y - CONFIG_CMD_BTRFS=y + CONFIG_CMD_BOOTMENU=n + CONFIG_AUTOBOOT_MENU_SHOW=n + CONFIG_BOOTDELAY=3 + + CONFIG_PCI=y + CONFIG_PCIE_MEDIATEK_GEN3=y + CONFIG_PCI_DEBUG=y + CONFIG_DM_DEBUG=y + CONFIG_NVME=y + CONFIG_NVME_PCI=y + CONFIG_CMD_NVME=y + #CONFIG_FS_BTRFS=y + #CONFIG_CMD_BTRFS=y CONFIG_BOARD_LATE_INIT=n ''; + postBuild = '' + ${final.buildPackages.armTrustedFirmwareTools}/bin/fiptool create \ + --soc-fw '${final.armTrustedFirmwareMT7981}/bl31.bin' \ + --nt-fw ./u-boot.bin \ + u-boot.fip + ''; }).overrideAttrs (oldAttrs: { nativeBuildInputs = [final.buildPackages.unixtools.xxd] ++ oldAttrs.nativeBuildInputs; }); @@ -78,15 +94,13 @@ final: prev: { if prev.hostPlatform.is32bit then # Downgrade to get 32bit support working - prev.gvproxy.overrideAttrs { + prev.gvproxy.overrideAttrs (oldAttrs: { version = "0.8.6"; - src = prev.buildPackages.fetchFromGitHub { - owner = "containers"; - repo = "gvisor-tap-vsock"; + src = oldAttrs.src.override { rev = "v0.8.6"; hash = "sha256-a/Gd1QUxZ+47sQtndbehx86UjC1DezhqwS5d5VTIjRc="; }; - } + }) else prev.gvproxy; # Older version of packages |