Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10)
cmake_minimum_required(VERSION 3.22)

set(CXX_DISABLE_WERROR 1)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)

set(PROJECT_NAME PandaControllerExample)
set(PROJECT_DESCRIPTION "PandaControllerExample")
Expand Down
23 changes: 19 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 4 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
description = "Example superbuild environment and controller with mc-panda and macos support";

inputs = {
# mc-rtc-nix.url = "github:mc-rtc/nixpkgs";
mc-rtc-nix.url = "github:mc-rtc/nixpkgs/pull/59/head";
# mc-rtc-nix.url = "path:/home/arnaud/devel/mc-rtc-nix/nixpkgs";
mc-rtc-nix.url = "github:mc-rtc/nixpkgs";
flake-parts.follows = "mc-rtc-nix/flake-parts";
systems.follows = "mc-rtc-nix/systems";
gepetto.follows = "mc-rtc-nix/gepetto";
Expand Down Expand Up @@ -61,12 +59,10 @@
"minimal"
"panda-controller-example-minimal"
];
# FIXME: disable mc-franka, it does not build on macos
runtime = {
# FIXME can't access stdenv, lib here
# apps = lib.optionals (!stdenv.hostPlatform.isDarwin) [
# pkgs.mc-franka
# ];
apps = [
pkgs.mc-franka
];
};
};
};
Expand Down
Loading