From 4fa63f845d43626957938e2c1d7f5ef0a8d6b9eb Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Thu, 23 Jan 2020 11:39:26 +0100
Subject: [PATCH] Fix Solo5 library

The solo5.lib.so library must be stripped to be compatible with ld.lib.so.
---
 packages/solo5/default.nix |  2 --
 tests/solo5/default.nix    |  2 +-
 tests/solo5/net_2if.dhall  |  2 +-
 tests/solo5/simple.dhall   | 22 ++++++++++++++++------
 tests/solo5/time.dhall     |  2 +-
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/packages/solo5/default.nix b/packages/solo5/default.nix
index 098a88c..389f913 100644
--- a/packages/solo5/default.nix
+++ b/packages/solo5/default.nix
@@ -43,8 +43,6 @@ in stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  dontFixup = true;
-
   meta = with stdenv.lib; {
     description = "Sandboxed execution environment.";
     homepage = "https://github.com/solo5/solo5";
diff --git a/tests/solo5/default.nix b/tests/solo5/default.nix
index d8a3406..2bcf3c5 100644
--- a/tests/solo5/default.nix
+++ b/tests/solo5/default.nix
@@ -5,7 +5,7 @@ with pkgs;
 
 let
   defaultScript = ''
-    run_genode_until {child "solo5" exited with exit value 0} 30
+    run_genode_until {SUCCESS} 30
   '';
 
   mkTest' = { name, testConfig, testScript ? defaultScript, ... }@attrs:
diff --git a/tests/solo5/net_2if.dhall b/tests/solo5/net_2if.dhall
index 86c70cf..e6ff36f 100644
--- a/tests/solo5/net_2if.dhall
+++ b/tests/solo5/net_2if.dhall
@@ -36,7 +36,7 @@ in  { config =
               , solo5 =
                   Genode.Init.Start::{
                   , binary = "solo5-test_net_2if"
-                  , resources = { caps = 256, ram = Genode.units.MiB 4 }
+                  , resources = { caps = 256, ram = Genode.units.MiB 5 }
                   , routes =
                       [ Genode.ServiceRoute.parent "Timer"
                       , Genode.ServiceRoute.child "Nic" "bridge"
diff --git a/tests/solo5/simple.dhall b/tests/solo5/simple.dhall
index e641f8f..9cde8bb 100644
--- a/tests/solo5/simple.dhall
+++ b/tests/solo5/simple.dhall
@@ -15,12 +15,22 @@ in    λ(testBinary : Genode.Prelude.Map.Entry Text Text)
                     , routes = [ Genode.ServiceRoute.parent "Timer" ]
                     , config =
                         Some
-                          ( Genode.Prelude.XML.text
-                              ''
-                               <config>
-                               	<cmdline>Hello_Solo5</cmdline>
-                              </config>
-                               ''
+                          ( Genode.Prelude.XML.element
+                              { name = "config"
+                              , attributes =
+                                  [] : Genode.Prelude.Map.Type Text Text
+                              , content =
+                                  [ Genode.Prelude.XML.element
+                                      { name = "cmdline"
+                                      , attributes =
+                                          [] : Genode.Prelude.Map.Type Text Text
+                                      , content =
+                                          [ Genode.Prelude.XML.text
+                                              "Hello_Solo5"
+                                          ]
+                                      }
+                                  ]
+                              }
                           )
                     }
                 }
diff --git a/tests/solo5/time.dhall b/tests/solo5/time.dhall
index 9519997..21340dd 100644
--- a/tests/solo5/time.dhall
+++ b/tests/solo5/time.dhall
@@ -29,5 +29,5 @@ in  { config =
                   }
               }
         }
-    , rom = [ test os.bin.rtc_drv ]
+    , rom = [ test, os.bin.rtc_drv ]
     }