2
0
Fork 0

Add libc to flake

This commit is contained in:
Emery Hemingway 2019-11-11 21:41:37 +01:00
parent ace8d49163
commit 2a8398984e
2 changed files with 7 additions and 3 deletions

View File

@ -17,11 +17,15 @@
in {
lib = import ./lib { genodepkgs = self; inherit nixpkgs dhall-haskell genode-depot; };
lib = import ./lib {
genodepkgs = self;
inherit nixpkgs dhall-haskell genode-depot;
};
packages = forAllSystems (system:
import ./packages.nix {
inherit system nixpkgs;
depot = builtins.getAttr system genode-depot.packages;
});
checks = forAllSystems (system:

View File

@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: LicenseRef-Hippocratic-1.1
{ system, nixpkgs }:
{ system, nixpkgs, depot }:
let
toolchainOverlay = import ./toolchain-overlay;
@ -13,7 +13,6 @@ let
inherit (super) callPackage;
genode = (callPackage ./upstream { } // {
libc = callPackage ./pkgs/libc { };
nic_bus = callPackage ./pkgs/nic_bus { };
});
dhallPackages = super.dhallPackages // (callPackage ./dhall { });
@ -23,6 +22,7 @@ in rec {
genode-base-linux = genode.base-linux;
genode-base-nova = genode.base-nova;
genode-os = genode.os;
libc = callPackage ./pkgs/libc { inherit depot; };
dhallGenode = dhallPackages.genode;
dhallPrelude = dhallPackages.prelude;