M-Labs
/
nix-servo
3
1
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flake: use nixpkgs-unstable to build u-boot

This commit is contained in:
Florian Agbuya 2023-11-28 13:47:45 +08:00
parent d996f1a6c7
commit 678b9f50cf
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.nix
View File

@ -1,12 +1,16 @@
{ {
description = "Not-OS port to the Zynq-7000 platform"; description = "Not-OS port to the Zynq-7000 platform";
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05;
inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.not-os.url = github:cleverca22/not-os; inputs.not-os.url = github:cleverca22/not-os;
inputs.not-os.inputs.nixpkgs.follows = "nixpkgs";
outputs = { self, nixpkgs, not-os }: outputs = { self, nixpkgs, nixpkgs-unstable, not-os }:
let let
pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs = import nixpkgs { system = "x86_64-linux"; };
# To be used for building u-boot.
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
gnu-platform = "arm-none-eabi"; gnu-platform = "arm-none-eabi";
@ -174,7 +178,9 @@
dontFixup = true; dontFixup = true;
}; };
u-boot = pkgs.pkgsCross.armv7l-hf-multiplatform.buildUBoot { # U-boot needs the recent patch in master to fix cross-compile issues.
# See https://github.com/NixOS/nixpkgs/pull/265411.
u-boot = pkgs-unstable.pkgsCross.armv7l-hf-multiplatform.buildUBoot {
defconfig = "xilinx_zynq_virt_defconfig"; defconfig = "xilinx_zynq_virt_defconfig";
preConfigure = '' preConfigure = ''
export DEVICE_TREE=zynq-zc706 export DEVICE_TREE=zynq-zc706