Add missing manifests to libc and stdcxx
This commit is contained in:
parent
9e42e0893d
commit
638f072d9b
|
@ -8,12 +8,14 @@ let
|
||||||
dhallPackages = legacyPackages.dhallPackages // (callPackage ./dhall { });
|
dhallPackages = legacyPackages.dhallPackages // (callPackage ./dhall { });
|
||||||
|
|
||||||
mkDhallManifest = drv:
|
mkDhallManifest = drv:
|
||||||
legacyPackages.runCommand "${drv.name}.dhall" {
|
legacyPackages.runCommand "${drv.name}.dhall" { inherit drv; }
|
||||||
inherit drv;
|
"${apps.generate-manifest.program} $drv > $out";
|
||||||
} "${apps.generate-manifest.program} $drv > $out";
|
|
||||||
|
|
||||||
addManifest = drv: { manifest = mkDhallManifest drv; } // drv;
|
addManifest = drv: { manifest = mkDhallManifest drv; } // drv;
|
||||||
|
|
||||||
|
callPackage' = path: attrs:
|
||||||
|
addManifest (legacyPackages.callPackages path attrs);
|
||||||
|
|
||||||
in rec {
|
in rec {
|
||||||
|
|
||||||
inherit (legacyPackages) stdenv;
|
inherit (legacyPackages) stdenv;
|
||||||
|
@ -31,18 +33,18 @@ in rec {
|
||||||
|
|
||||||
NOVA = legacyPackages.callPackage ./NOVA { };
|
NOVA = legacyPackages.callPackage ./NOVA { };
|
||||||
|
|
||||||
libc = callPackage ./libc { inherit depot; };
|
libc = callPackage' ./libc { inherit depot; };
|
||||||
|
|
||||||
nic_bus = callPackage ./nic_bus { inherit (genode) base os; };
|
nic_bus = callPackage ./nic_bus { inherit (genode) base os; };
|
||||||
|
|
||||||
solo5 = let drv = callPackage ./solo5 { inherit (genode) base os; };
|
solo5 = let drv = callPackage' ./solo5 { inherit (genode) base os; };
|
||||||
in addManifest drv // { tests = addManifest drv.tests // { pname = "solo5-tests"; }; };
|
in drv // { tests = addManifest drv.tests // { pname = "solo5-tests"; }; };
|
||||||
|
|
||||||
sotest-producer = addManifest (callPackage ./sotest-producer {
|
sotest-producer = callPackage' ./sotest-producer {
|
||||||
stdenv = genode.stdenvGcc;
|
stdenv = genode.stdenvGcc;
|
||||||
inherit genode;
|
inherit genode;
|
||||||
});
|
};
|
||||||
|
|
||||||
stdcxx = callPackage ./stdcxx { };
|
stdcxx = callPackage' ./stdcxx { };
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue