~ehmry/sigil

69a72cac303dcb5f1154ba78ac537c3f7d1adf76 — Emery Hemingway 3 years ago 506e3bf llvm-11
solo5: patch misleading indentation
2 files changed, 21 insertions(+), 1 deletions(-)

M packages/solo5/default.nix
A packages/solo5/misleading-indentation.patch
M packages/solo5/default.nix => packages/solo5/default.nix +6 -1
@@ 18,7 18,12 @@ in stdenv.mkDerivation {

  enableParallelBuilding = true;

  patches = [ ./genode.patch ./elftool.patch ./test_time.patch ];
  patches = [
    ./genode.patch
    ./elftool.patch
    ./test_time.patch
    ./misleading-indentation.patch
  ];

  configurePhase = with stdenv; ''
    runHook preConfigure

A packages/solo5/misleading-indentation.patch => packages/solo5/misleading-indentation.patch +15 -0
@@ 0,0 1,15 @@
diff --git a/bindings/genode/bindings.cc b/bindings/genode/bindings.cc
index a4a4a34..1019a39 100644
--- a/bindings/genode/bindings.cc
+++ b/bindings/genode/bindings.cc
@@ -475,8 +475,8 @@ struct Solo5::Platform
 	net_acquire(const char *name, solo5_handle_t &handle, solo5_net_info &info)
 	{
 		unsigned index = ~0;
-		struct mft_entry *me = mft_get_by_name(&mft, name, MFT_DEV_NET_BASIC, &index); {
-		if (me != nullptr && index < MFT_MAX_ENTRIES)
+		mft_entry *me = mft_get_by_name(&mft, name, MFT_DEV_NET_BASIC, &index);
+		if (me != nullptr && index < MFT_MAX_ENTRIES) {
 			handle = index;
 			return devices[index]->net_info(info);
 		}