Skip to content

Commit b854868

Browse files
committed
qt-gui-cpp: switch to qt6
It thought this was already done in #708
1 parent 67db780 commit b854868

File tree

1 file changed

+27
-0
lines changed

1 file changed

+27
-0
lines changed

distros/distro-overlay.nix

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,33 @@ let
256256
'';
257257
});
258258

259+
qt-gui-cpp = rosSuper.qt-gui-cpp.overrideAttrs (
260+
{
261+
patches ? [ ],
262+
propagatedBuildInputs ? [ ],
263+
...
264+
}:
265+
{
266+
patches = patches ++ [
267+
# ref. https://github.com/ros-visualization/qt_gui_core/pull/309, just to allow the other patch to apply
268+
(self.fetchpatch {
269+
url = "https://github.com/ros-visualization/qt_gui_core/commit/d07b80eac7657fe56b6581e94fa67b91056715a2.patch";
270+
hash = "sha256-99nUTiYqUm6R+YmM0hfk3+C3uyzHqmW8b8xkb+oM6TY=";
271+
stripLen = 1;
272+
revert = true;
273+
})
274+
# Qt 5 -> 6
275+
# ref. https://github.com/ros-visualization/qt_gui_core/pull/293
276+
(self.fetchpatch {
277+
url = "https://github.com/ros-visualization/qt_gui_core/commit/21941697c5584dc73968a8b50c51df2aef929562.patch";
278+
hash = "sha256-4MO4X0AyK9X7UsVBxVosR9bx+62tZgXgJ3a6n2q5E1A=";
279+
stripLen = 1;
280+
})
281+
];
282+
propagatedBuildInputs = propagatedBuildInputs ++ [ rosSuper.tinyxml2-vendor ];
283+
}
284+
);
285+
259286
rqt-image-view = rosSuper.rqt-image-view.overrideAttrs ({
260287
nativeBuildInputs ? [], postFixup ? "", ...
261288
}: {

0 commit comments

Comments
 (0)