From bf06ff6123a04db77fc62ee97a1c91dbcff8b3e2 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 18 Jun 2023 22:35:53 -0400 Subject: [PATCH] rviz2: fix overriding meta --- distros/ros2-overlay.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/distros/ros2-overlay.nix b/distros/ros2-overlay.nix index 2075e22048..d632392b47 100644 --- a/distros/ros2-overlay.nix +++ b/distros/ros2-overlay.nix @@ -159,14 +159,16 @@ rosSelf: rosSuper: with rosSelf.lib; { }); rviz2 = rosSuper.rviz2.overrideAttrs ({ - nativeBuildInputs ? [], postFixup ? "", ... + nativeBuildInputs ? [], postFixup ? "", meta ? {}, ... }: { dontWrapQtApps = false; nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ]; postFixup = postFixup + '' wrapQtApp "$out/lib/rviz2/rviz2" ''; - meta.mainProgram = "rviz2"; + meta = meta // { + mainProgram = "rviz2"; + }; }); # The build gets stuck in an infinite loop with absolute CMAKE_INSTALL_LIBDIR: