add a flake file for the rpi, currently configured for native buildin…

…g only

base.nix

@@ -39,6 +39,22 @@ with lib;
         The set of NTP servers from which to synchronise.
       '';
     };
+    system.systemBuilderArgs = mkOption {
+      type = types.attrsOf types.unspecified;
+      internal = true;
+      default = {};
+      description = lib.mdDoc ''
+        `lib.mkDerivation` attributes that will be passed to the top level system builder.
+      '';
+    };
+    system.systemBuilderCommands = mkOption {
+      type = types.lines;
+      internal = true;
+      default = "";
+      description = ''
+        This code will be added to the builder creating the system store path.
+      '';
+    };
   };
   config = {
     environment.systemPackages = lib.optional config.not-os.nix pkgs.nix;

default.nix

@@ -1,12 +1,26 @@
-{ configuration ? import ./configuration.nix, nixpkgs ? <nixpkgs>, extraModules ? [], system ? builtins.currentSystem, platform ? null }:
+{ configuration ? import ./configuration.nix
+, nixpkgs ? <nixpkgs>
+, extraModules ? []
+, system ? builtins.currentSystem
+, platform ? null
+, crossSystem ? null }:
 
 let
   pkgs = import nixpkgs { inherit system; platform = platform; config = {}; };
-  pkgsModule = rec {
+  pkgsModule = {config, ... }: {
     _file = ./default.nix;
-    key = _file;
+    key = ./default.nix;
     config = {
-      nixpkgs.localSystem = { inherit system; };
+      nixpkgs.pkgs = (import nixpkgs {
+        inherit system;
+        #crossSystem = (import <nixpkgs/lib>).systems.examples.aarch64-multiplatform;
+        config = config.nixpkgs.config;
+      });
+      nixpkgs.localSystem = {
+        inherit system;
+      } // pkgs.lib.optionalAttrs (crossSystem != null) {
+        inherit crossSystem;
+      };
     };
   };
   baseModules = [

flake.nix

@@ -0,0 +1,23 @@
+{
+  inputs = {
+    firmware = {
+      url = "github:raspberrypi/firmware";
+      flake = false;
+    };
+  };
+  outputs = { self, nixpkgs, firmware }: {
+    packages.armv7l-linux = let
+      platforms = (import nixpkgs { config = {}; }).platforms;
+    in {
+      rpi_image = (import ./default.nix {
+        extraModules = [
+          ./rpi_image.nix
+          { system.build.rpi_firmware = firmware; }
+        ];
+        platform = system: platforms.raspberrypi2;
+        system = "armv7l-linux";
+        inherit nixpkgs;
+      }).config.system.build.rpi_image;
+    };
+  };
+}

rpi_image.nix

@@ -11,17 +11,18 @@
     cmdline = pkgs.writeText "cmdline.txt" ''
       console=ttyS0,115200 pi3-disable-bt kgdboc=ttyS0,115200 systemConfig=${builtins.unsafeDiscardStringContext config.system.build.toplevel} netroot=192.168.2.1=9080d9b6/root.squashfs quiet splash plymouth.ignore-serial-consoles plymouth.ignore-udev
     '';
+    firm = config.system.build.rpi_firmware;
   in pkgs.runCommand "rpi_image" {} ''
     mkdir $out
     cd $out
     cp ${config_txt} config.txt
     cp ${cmdline} cmdline.txt
     cp -s ${config.system.build.kernel}/*zImage kernel7.img
     cp -s ${config.system.build.squashfs} root.squashfs
-    cp ${./../bcm2710-rpi-3-b.dtb} bcm2710-rpi-3-b.dtb
-    cp -r ${./../../overlays} overlays
-    cp -s ${../../start.elf} start.elf
-    cp ${../../fixup.dat} fixup.dat
+    cp ${firm}/boot/bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b.dtb
+    cp -r ${firm}/boot/overlays overlays
+    cp -s ${firm}/boot/start.elf start.elf
+    cp ${firm}/boot/fixup.dat fixup.dat
     cp -s ${config.system.build.initialRamdisk}/initrd initrd
     ls -ltrhL
   '';