Add libc to flake
This commit is contained in:
parent
ace8d49163
commit
2a8398984e
|
@ -17,11 +17,15 @@
|
||||||
|
|
||||||
in {
|
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:
|
packages = forAllSystems (system:
|
||||||
import ./packages.nix {
|
import ./packages.nix {
|
||||||
inherit system nixpkgs;
|
inherit system nixpkgs;
|
||||||
|
depot = builtins.getAttr system genode-depot.packages;
|
||||||
});
|
});
|
||||||
|
|
||||||
checks = forAllSystems (system:
|
checks = forAllSystems (system:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: LicenseRef-Hippocratic-1.1
|
# SPDX-License-Identifier: LicenseRef-Hippocratic-1.1
|
||||||
|
|
||||||
{ system, nixpkgs }:
|
{ system, nixpkgs, depot }:
|
||||||
|
|
||||||
let
|
let
|
||||||
toolchainOverlay = import ./toolchain-overlay;
|
toolchainOverlay = import ./toolchain-overlay;
|
||||||
|
@ -13,7 +13,6 @@ let
|
||||||
inherit (super) callPackage;
|
inherit (super) callPackage;
|
||||||
|
|
||||||
genode = (callPackage ./upstream { } // {
|
genode = (callPackage ./upstream { } // {
|
||||||
libc = callPackage ./pkgs/libc { };
|
|
||||||
nic_bus = callPackage ./pkgs/nic_bus { };
|
nic_bus = callPackage ./pkgs/nic_bus { };
|
||||||
});
|
});
|
||||||
dhallPackages = super.dhallPackages // (callPackage ./dhall { });
|
dhallPackages = super.dhallPackages // (callPackage ./dhall { });
|
||||||
|
@ -23,6 +22,7 @@ in rec {
|
||||||
genode-base-linux = genode.base-linux;
|
genode-base-linux = genode.base-linux;
|
||||||
genode-base-nova = genode.base-nova;
|
genode-base-nova = genode.base-nova;
|
||||||
genode-os = genode.os;
|
genode-os = genode.os;
|
||||||
|
libc = callPackage ./pkgs/libc { inherit depot; };
|
||||||
|
|
||||||
dhallGenode = dhallPackages.genode;
|
dhallGenode = dhallPackages.genode;
|
||||||
dhallPrelude = dhallPackages.prelude;
|
dhallPrelude = dhallPackages.prelude;
|
||||||
|
|
Loading…
Reference in New Issue