2
0
Fork 0

Add missing manifests to libc and stdcxx

20.02
Emery Hemingway 3 years ago
parent 9e42e0893d
commit 638f072d9b
  1. 20
      packages/default.nix

@ -8,12 +8,14 @@ let
dhallPackages = legacyPackages.dhallPackages // (callPackage ./dhall { });
mkDhallManifest = drv:
legacyPackages.runCommand "${drv.name}.dhall" {
inherit drv;
} "${apps.generate-manifest.program} $drv > $out";
legacyPackages.runCommand "${drv.name}.dhall" { inherit drv; }
"${apps.generate-manifest.program} $drv > $out";
addManifest = drv: { manifest = mkDhallManifest drv; } // drv;
callPackage' = path: attrs:
addManifest (legacyPackages.callPackages path attrs);
in rec {
inherit (legacyPackages) stdenv;
@ -31,18 +33,18 @@ in rec {
NOVA = legacyPackages.callPackage ./NOVA { };
libc = callPackage ./libc { inherit depot; };
libc = callPackage' ./libc { inherit depot; };
nic_bus = callPackage ./nic_bus { inherit (genode) base os; };
solo5 = let drv = callPackage ./solo5 { inherit (genode) base os; };
in addManifest drv // { tests = addManifest drv.tests // { pname = "solo5-tests"; }; };
solo5 = let drv = callPackage' ./solo5 { inherit (genode) base os; };
in drv // { tests = addManifest drv.tests // { pname = "solo5-tests"; }; };
sotest-producer = addManifest (callPackage ./sotest-producer {
sotest-producer = callPackage' ./sotest-producer {
stdenv = genode.stdenvGcc;
inherit genode;
});
};
stdcxx = callPackage ./stdcxx { };
stdcxx = callPackage' ./stdcxx { };
}

Loading…
Cancel
Save