From fff6833190ed41a3b347b62433cc7bf5a0598776 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 4 Aug 2020 09:00:12 +0200
Subject: [PATCH] Update flake, add aarch64-linux to build platforms

---
 flake.lock                        | 16 +++++++---------
 flake.nix                         |  8 +++-----
 packages/genodelabs/default.nix   |  1 -
 packages/genodelabs/toolchain.nix |  2 +-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2f0b18c..71d0733 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,19 +1,17 @@
 {
   "nodes": {
     "nixpkgs": {
-      "info": {
-        "lastModified": 1590234271,
-        "narHash": "sha256-4ue8WrJo/bgX9RzVFD7Yc/FCPAbxIwOkpdxNvvf2W3M="
-      },
       "locked": {
-        "owner": "ehmry",
+        "lastModified": 1596415340,
+        "narHash": "sha256-w+d5U+A+pEDUraHaYfnnmfK3m3ZNpc4S3YvfhqP0ffs=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "36370577bd65bea3addd476267db410697fda370",
+        "rev": "b5f7ed6846b265a943d65720ca95d4c6eaa1c7b5",
         "type": "github"
       },
       "original": {
-        "owner": "ehmry",
-        "ref": "genode",
+        "owner": "NixOS",
+        "ref": "staging",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -25,5 +23,5 @@
     }
   },
   "root": "root",
-  "version": 5
+  "version": 7
 }
diff --git a/flake.nix b/flake.nix
index 7595e7a..7a9ef99 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,15 +1,13 @@
 # SPDX-License-Identifier: CC0-1.0
 
 {
-  edition = 201909;
-
   description = "Genode packages";
 
-  inputs.nixpkgs.url = "github:ehmry/nixpkgs/genode";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/staging";
 
   outputs = { self, nixpkgs }:
     let
-      localSystems = [ "x86_64-linux" ];
+      localSystems = [ "aarch64-linux" "x86_64-linux" ];
       crossSystems = [ "aarch64-genode" "x86_64-genode" ];
 
       forAllLocalSystems = f:
@@ -110,7 +108,7 @@
               extraBuildCommands = let
                 toolchain = pkgs.fetchzip {
                   url =
-                    "file://${packages.x86_64-linux-x86_64-genode.genodeSources.toolchain.src}";
+                    "file://${self.legacyPackages.${system}.genodeSources.toolchain.src}";
                   hash = "sha256-26rPvLUPEJm40zLSqTquwuFTJ1idTB0T4VXgaHRN+4o=";
                 };
               in "ln -s ${toolchain}/local usr/local";
diff --git a/packages/genodelabs/default.nix b/packages/genodelabs/default.nix
index de8f4d1..be7e58a 100644
--- a/packages/genodelabs/default.nix
+++ b/packages/genodelabs/default.nix
@@ -19,7 +19,6 @@ let
   genodeSources =
     # The Genode source repository
     let
-
       toolPrefix = if platform.isx86 then
         "genode-x86-"
       else if platform.isAarch64 then
diff --git a/packages/genodelabs/toolchain.nix b/packages/genodelabs/toolchain.nix
index 6d3ce5a..4df30ed 100644
--- a/packages/genodelabs/toolchain.nix
+++ b/packages/genodelabs/toolchain.nix
@@ -20,7 +20,7 @@ let
         sha256 = "036czy21zk7fvz1y1p67q3d5hgg8rb8grwabgrvzgdsqcv2ls6l9";
       };
     }.${stdenv.buildPlatform.system} or (throw
-      "cannot install Genode toolchain on this platform"));
+      "cannot prepare Genode toolchain on ${stdenv.buildPlatform.system}"));
 
     preferLocalBuild = true;