From ac11a14f9ba10685ae68ab5a050baf546ae702d2 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 2 Dec 2019 17:55:04 +0100 Subject: [PATCH] Use cross-compile pairs in Flake --- flake.lock | 6 +++--- flake.nix | 13 ++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a730a19..46cb2b2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,9 +2,9 @@ "inputs": { "nixpkgs": { "inputs": {}, - "narHash": "sha256-Y5ZOTgInrYYoas3vM8uTPLA2DvFI9YoI6haftIKl9go=", - "originalUrl": "nixpkgs", - "url": "github:edolstra/nixpkgs/015c9ec3372e328ea6742b409a1e9aa26dab2b31" + "narHash": "sha256-/9hMb9pgV8awDYYchUueplyKF6bz23b7z5gqQ999nro=", + "originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode", + "url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=d63ee96d86672a9cb23d83d50ee02687eded2818" } }, "version": 3 diff --git a/flake.nix b/flake.nix index 2bea90e..561b8a4 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,8 @@ edition = 201909; + inputs.nixpkgs.uri = "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode"; + outputs = { self, nixpkgs }: let unpack = baseUrl: @@ -38,9 +40,14 @@ expand = baseUrl: listing: builtins.listToAttrs (map (unpack baseUrl) listing); - in { - packages.x86_64-genode = - expand "http://depot.genode.org/genodelabs/bin/x86_64/" + pkgs = expand "http://depot.genode.org/genodelabs/bin/x86_64/" (import ./genodelabs-list.nix); + + in { + packages = { + x86_64-linux-x86_64-genode = pkgs; + x86_64-linux = pkgs; + }; + checks = self.packages; }; }