insert mantis-extvm-pb into the build instead of using submodules

Author: manveru

nix/mantis.nix

@@ -12,7 +12,8 @@
 , gnused
 , protobuf
 , substituteAll
-, writeShellScriptBin
+, writeBashBinChecked
+, mantis-extvm-pb
 }:
 
 let
@@ -25,17 +26,16 @@ let
   LD_LIBRARY_PATH = ''''; #lib.makeLibraryPath [ libsonic ];
 
   # filter out mentions of protobridge, which is unable to execute
-  protoc-wrapper = writeShellScriptBin "protoc" ''
+  protoc-wrapper = writeBashBinChecked "protoc" ''
     set -e
 
     for f in "$@"; do
-      echo ''${f##*=}
+      echo "''${f##*=}"
     done | grep protocbridge | xargs sed -i "1s|.*|#!${runtimeShell}|"
 
     exec ${protobuf}/bin/protoc "$@"
   '';
 
-
 in sbt.mkDerivation rec {
   pname = "mantis";
   inherit src version;
@@ -45,6 +45,9 @@ in sbt.mkDerivation rec {
   preConfigure = ''
     HOME=$TMPDIR
     PROTOC_CACHE=.nix/protoc-cache
+
+    mkdir -p src/main/protobuf/extvm
+    cp ${mantis-extvm-pb}/msg.proto src/main/protobuf/extvm/msg.proto
   '';
 
   # used by sbt-derivation to modify vendor derivation

nix/overlay.nix

@@ -2,26 +2,27 @@ rev: final: prev: {
   jre = prev.jdk8.jre;
 
   mantis = final.callPackage ./mantis.nix {
-    src = builtins.fetchGit {
-      url = "https://github.com/input-output-hk/mantis";
-      ref = "develop";
-      rev = rev;
-      submodules = true;
-    };
+    src = ../.;
   };
 
   mantis-hash = { ref, rev }:
     (final.callPackage ./mantis.nix {
       src = builtins.fetchGit {
         url = "https://github.com/input-output-hk/mantis";
         inherit rev ref;
-        submodules = true;
       };
     }).overrideAttrs (_: {
       outputHash = "sha256-0000000000000000000000000000000000000000000=";
       outputHashMode = "recursive";
     });
 
+  # Last change to this was in 2018, so to avoid submodules we just clone
+  # ourselves instead.
+  mantis-extvm-pb = builtins.fetchGit {
+    url = "https://github.com/input-output-hk/mantis-extvm-pb";
+    rev =  "53eb31f3c59f7200994915b834e626bd292df7ed";
+  };
+
   writeBashChecked = final.writers.makeScriptWriter {
     interpreter = "${final.bashInteractive}/bin/bash";
     check = final.writers.writeBash "shellcheck-check" ''