From 357ebbbaffead7c15eed1e81cabb5a5086a596a1 Mon Sep 17 00:00:00 2001 From: Arnaud TANGUY Date: Sun, 21 Jun 2026 17:36:38 +0200 Subject: [PATCH 1/4] fix(macos): update to nixpkgs#60 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2b3e14d..b4b4976 100644 --- a/flake.lock +++ b/flake.lock @@ -662,11 +662,11 @@ "with-ros-trigger": "with-ros-trigger" }, "locked": { - "lastModified": 1781974813, - "narHash": "sha256-BALwn9/3/izqXV62Se4gkQrsLBxCXImOq9lqMFxYYVE=", + "lastModified": 1781975406, + "narHash": "sha256-hZHOMpR7pBWE48/xEfoOIDFtDz1N39yBy2oFtOqXAuw=", "owner": "mc-rtc", "repo": "nixpkgs", - "rev": "2480a3c3848582037b7a4a5454d7b49dbdd138f5", + "rev": "cfec8f108ad2e59b7b4dc68ad0ed37cf1be35abd", "type": "github" }, "original": { From 180220d680d220eae71daf56649e76334899243b Mon Sep 17 00:00:00 2001 From: Arnaud TANGUY Date: Mon, 22 Jun 2026 19:12:04 +0200 Subject: [PATCH 2/4] macos: update flake.lock --- flake.lock | 23 +++++++++++++++++++---- flake.nix | 4 +--- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index b4b4976..5527c10 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": 1781975406, - "narHash": "sha256-hZHOMpR7pBWE48/xEfoOIDFtDz1N39yBy2oFtOqXAuw=", + "lastModified": 1782145040, + "narHash": "sha256-JrbWO/YS3pARuxP1q3mEcFqPDct+zzt4Gc9Eo3GMp58=", "owner": "mc-rtc", "repo": "nixpkgs", - "rev": "cfec8f108ad2e59b7b4dc68ad0ed37cf1be35abd", + "rev": "0d5737897d8a2777371d09ea28e9678c152756ee", "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..4a44b0f 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"; From 7f0697cf7f5e5c33160fdc3c253b13bd5351da63 Mon Sep 17 00:00:00 2001 From: Arnaud TANGUY Date: Mon, 22 Jun 2026 20:40:53 +0200 Subject: [PATCH 3/4] feat: use c++17 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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") From b4a5c98c2477806867fb8c2fa22d39124e1b7c0e Mon Sep 17 00:00:00 2001 From: Arnaud TANGUY Date: Mon, 22 Jun 2026 20:46:27 +0200 Subject: [PATCH 4/4] fix(macos): fix mc-franka (upgrade libpoco, adapt libfranka) --- flake.lock | 6 +++--- flake.nix | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 5527c10..14b2c0c 100644 --- a/flake.lock +++ b/flake.lock @@ -663,11 +663,11 @@ "with-ros-trigger": "with-ros-trigger" }, "locked": { - "lastModified": 1782145040, - "narHash": "sha256-JrbWO/YS3pARuxP1q3mEcFqPDct+zzt4Gc9Eo3GMp58=", + "lastModified": 1782210979, + "narHash": "sha256-3TSYQ9sq0Q/REjuJjI5EgI+yGYsQxThjo9DgI32tFSY=", "owner": "mc-rtc", "repo": "nixpkgs", - "rev": "0d5737897d8a2777371d09ea28e9678c152756ee", + "rev": "c2625a35552acb7f59f062ca82db3ef84b3cb1da", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4a44b0f..8d70ba7 100644 --- a/flake.nix +++ b/flake.nix @@ -59,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 + ]; }; }; };