From 638f072d9b3db30c8c6fd0a778f4a9ec3e4c3c6e Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sat, 25 Jan 2020 17:11:10 +0100
Subject: [PATCH] Add missing manifests to libc and stdcxx

---
 packages/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/default.nix b/packages/default.nix
index 1a3f0c1..693f9d6 100644
--- a/packages/default.nix
+++ b/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 { };
 
 }