Update flake, add aarch64-linux to build platforms
This commit is contained in:
parent
4f74ff9452
commit
fff6833190
16
flake.lock
16
flake.lock
|
@ -1,19 +1,17 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"info": {
|
|
||||||
"lastModified": 1590234271,
|
|
||||||
"narHash": "sha256-4ue8WrJo/bgX9RzVFD7Yc/FCPAbxIwOkpdxNvvf2W3M="
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"owner": "ehmry",
|
"lastModified": 1596415340,
|
||||||
|
"narHash": "sha256-w+d5U+A+pEDUraHaYfnnmfK3m3ZNpc4S3YvfhqP0ffs=",
|
||||||
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "36370577bd65bea3addd476267db410697fda370",
|
"rev": "b5f7ed6846b265a943d65720ca95d4c6eaa1c7b5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "ehmry",
|
"owner": "NixOS",
|
||||||
"ref": "genode",
|
"ref": "staging",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -25,5 +23,5 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
"version": 5
|
"version": 7
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,13 @@
|
||||||
# SPDX-License-Identifier: CC0-1.0
|
# SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
{
|
{
|
||||||
edition = 201909;
|
|
||||||
|
|
||||||
description = "Genode packages";
|
description = "Genode packages";
|
||||||
|
|
||||||
inputs.nixpkgs.url = "github:ehmry/nixpkgs/genode";
|
inputs.nixpkgs.url = "github:NixOS/nixpkgs/staging";
|
||||||
|
|
||||||
outputs = { self, nixpkgs }:
|
outputs = { self, nixpkgs }:
|
||||||
let
|
let
|
||||||
localSystems = [ "x86_64-linux" ];
|
localSystems = [ "aarch64-linux" "x86_64-linux" ];
|
||||||
crossSystems = [ "aarch64-genode" "x86_64-genode" ];
|
crossSystems = [ "aarch64-genode" "x86_64-genode" ];
|
||||||
|
|
||||||
forAllLocalSystems = f:
|
forAllLocalSystems = f:
|
||||||
|
@ -110,7 +108,7 @@
|
||||||
extraBuildCommands = let
|
extraBuildCommands = let
|
||||||
toolchain = pkgs.fetchzip {
|
toolchain = pkgs.fetchzip {
|
||||||
url =
|
url =
|
||||||
"file://${packages.x86_64-linux-x86_64-genode.genodeSources.toolchain.src}";
|
"file://${self.legacyPackages.${system}.genodeSources.toolchain.src}";
|
||||||
hash = "sha256-26rPvLUPEJm40zLSqTquwuFTJ1idTB0T4VXgaHRN+4o=";
|
hash = "sha256-26rPvLUPEJm40zLSqTquwuFTJ1idTB0T4VXgaHRN+4o=";
|
||||||
};
|
};
|
||||||
in "ln -s ${toolchain}/local usr/local";
|
in "ln -s ${toolchain}/local usr/local";
|
||||||
|
|
|
@ -19,7 +19,6 @@ let
|
||||||
genodeSources =
|
genodeSources =
|
||||||
# The Genode source repository
|
# The Genode source repository
|
||||||
let
|
let
|
||||||
|
|
||||||
toolPrefix = if platform.isx86 then
|
toolPrefix = if platform.isx86 then
|
||||||
"genode-x86-"
|
"genode-x86-"
|
||||||
else if platform.isAarch64 then
|
else if platform.isAarch64 then
|
||||||
|
|
|
@ -20,7 +20,7 @@ let
|
||||||
sha256 = "036czy21zk7fvz1y1p67q3d5hgg8rb8grwabgrvzgdsqcv2ls6l9";
|
sha256 = "036czy21zk7fvz1y1p67q3d5hgg8rb8grwabgrvzgdsqcv2ls6l9";
|
||||||
};
|
};
|
||||||
}.${stdenv.buildPlatform.system} or (throw
|
}.${stdenv.buildPlatform.system} or (throw
|
||||||
"cannot install Genode toolchain on this platform"));
|
"cannot prepare Genode toolchain on ${stdenv.buildPlatform.system}"));
|
||||||
|
|
||||||
preferLocalBuild = true;
|
preferLocalBuild = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue