diff --git a/CMakeLists.txt b/CMakeLists.txt index 94dc078..e13f023 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/flake.lock b/flake.lock index 2b3e14d..14b2c0c 100644 --- a/flake.lock +++ b/flake.lock @@ -659,19 +659,19 @@ "gepetto", "systems" ], + "with-python-trigger": "with-python-trigger", "with-ros-trigger": "with-ros-trigger" }, "locked": { - "lastModified": 1781974813, - "narHash": "sha256-BALwn9/3/izqXV62Se4gkQrsLBxCXImOq9lqMFxYYVE=", + "lastModified": 1782210979, + "narHash": "sha256-3TSYQ9sq0Q/REjuJjI5EgI+yGYsQxThjo9DgI32tFSY=", "owner": "mc-rtc", "repo": "nixpkgs", - "rev": "2480a3c3848582037b7a4a5454d7b49dbdd138f5", + "rev": "c2625a35552acb7f59f062ca82db3ef84b3cb1da", "type": "github" }, "original": { "owner": "mc-rtc", - "ref": "pull/59/head", "repo": "nixpkgs", "type": "github" } @@ -1344,6 +1344,21 @@ "type": "github" } }, + "with-python-trigger": { + "locked": { + "lastModified": 1657739253, + "narHash": "sha256-L9eyTL7njtPBUYmZRYFKCzQFDgua9U9oE7UwCzjZfl8=", + "owner": "boolean-option", + "repo": "true", + "rev": "6ecb49143ca31b140a5273f1575746ba93c3f698", + "type": "github" + }, + "original": { + "owner": "boolean-option", + "repo": "true", + "type": "github" + } + }, "with-ros-trigger": { "locked": { "lastModified": 1657739253, diff --git a/flake.nix b/flake.nix index 057ac39..8d70ba7 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; @@ -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 + ]; }; }; };