Merge of #53

Author: mergify[bot]

pkgs/mc-rtc-imgui/default.nix

@@ -15,14 +15,14 @@ stdenv.mkDerivation (_finalAttrs: {
 
   dontBuild = true;
 
-  src =
-    # head of nix branch (for stanalone install)
-    fetchFromGitHub {
-      owner = "mc-rtc";
-      repo = "mc_rtc-imgui";
-      rev = "3e6c1617a5e622795019b2bccd2ba259df18026f";
-      hash = "sha256-KmcF5e0O2bQheTArjxaDeBQlxf3cywaFtNlxleHYsL8=";
-    };
+  # head of nix branch (for stanalone install)
+  # https://github.com/mc-rtc/mc_rtc-imgui/tree/nix
+  src = fetchFromGitHub {
+    owner = "mc-rtc";
+    repo = "mc_rtc-imgui";
+    rev = "6ac125c00ca5e18c7da80e0049dc5697f4f36a23";
+    hash = "sha256-J9uQpfn08Yv5ROxQmxHYwiVRdvZsVOp2klZmgnw90Bg=";
+  };
 
   nativeBuildInputs = [
     cmake

pkgs/mc-rtc/mc-mujoco/default.nix

@@ -6,6 +6,7 @@
   mc-mujoco-robots,
   cmake,
   jrl-cmakemodules,
+  cli11,
   mc-rtc,
   mujoco,
   pugixml,
@@ -29,13 +30,17 @@ stdenv.mkDerivation (_finalAttrs: {
 
   dontBuild = true;
 
+  # stanalone mc_mujoco version from
+  # https://github.com/rohanpsingh/mc_mujoco/pull/98
+  # we cannot merge as the standalone version cannot be easily set-up outside of Nix
   src = fetchFromGitHub {
     owner = "arntanguy";
     repo = "mc_mujoco";
-    tag = "1d17567c2264b32aceb3c77841765c0409a1e97";
-    hash = "sha256-h1TPFQ4qxrAk3bKdY7evZq8sRld8lIJHQKogLOiSF8I=";
+    rev = "8ca3efe89478c96abf74bd30675ccdc424bcf178";
+    hash = "sha256-GDJKEOyRjPF5eTpXA7x82K86fjLyx3N3eTt2ZSmcYv4=";
   };
 
+  buildInputs = [ cli11 ];
   nativeBuildInputs = [
     cmake
     jrl-cmakemodules