Propagate dependencies between depot packages
The buildDepot function now takes a "depotInputs" argument that propagates "portInputs" and "depotInputs" across packages. Drop the stdcxx package that includes a dev output and just use the simple depot package for now.
This commit is contained in:
parent
7a172c23c9
commit
83c36784ff
|
@ -199,7 +199,7 @@ let
|
|||
portInputs' = portInputs
|
||||
++ lib.concatMap (builtins.getAttr "portInputs") depotInputs';
|
||||
|
||||
in stdenv'.mkDerivation (extraAttrs // {
|
||||
self = stdenv'.mkDerivation (extraAttrs // {
|
||||
pname = name;
|
||||
inherit (genodeSources) version;
|
||||
enableParallelBuilding = true;
|
||||
|
@ -264,9 +264,10 @@ let
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = { inherit depotInputs portInputs; };
|
||||
passthru = { inherit portInputs depotInputs; };
|
||||
meta = { platforms = lib.platforms.genode; } // meta;
|
||||
});
|
||||
in self;
|
||||
|
||||
makePackages = let
|
||||
overrides = import ./make-targets.nix {
|
||||
|
|
Loading…
Reference in New Issue