movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-06-13 03:04:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rviz.

Browse source
This commit is contained in:
Ben Wolsieffer 2019-04-06 16:26:04 -04:00
parent c10dbc2e9a
commit b10d6c48e1
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1 +1 @@
result-* result

25
mk-distro-overlay.nix
View file

@ -92,22 +92,35 @@ self: super: with self.lib; let
}); });
python-qt-binding = rosSuper.python-qt-binding.overrideDerivation ({ python-qt-binding = rosSuper.python-qt-binding.overrideDerivation ({
propagatedNativeBuildInputs ? [],
postPatch ? "", ... postPatch ? "", ...
}: { }: {
propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ [ rosSelf.pythonPackages.sip ];
postPatch = '' postPatch = ''
sed -e "s#'-I', sip_dir,#'-I', '${rosSelf.pythonPackages.pyqt5}/share/sip/PyQt5',#" \ sed -e "s#'-I', sip_dir,#'-I', '${rosSelf.pythonPackages.pyqt5}/share/sip/PyQt5',#" \
-e "s#qtconfig\['QT_INSTALL_HEADERS'\]#'${self.qt5.qtbase.dev}/include'#g" \ -e "s#qtconfig\['QT_INSTALL_HEADERS'\]#'${self.qt5.qtbase.dev}/include'#g" \
-i cmake/sip_configure.py -i cmake/sip_configure.py
'' + postPatch; '' + postPatch;
setupHook = self.writeText "python-qt-binding-setup-hook" ''
_pythonQtBindingPreFixupHook() {
# Prevent /build RPATH references
rm -rf devel/lib
}
preFixupHooks+=(_pythonQtBindingPreFixupHook)
'';
}); });
qt-gui-cpp = rosSuper.qt-gui-cpp.overrideDerivation ({ rviz = rosSuper.rviz.overrideDerivation ({
nativeBuildInputs ? [], ... nativeBuildInputs ? [],
postFixup ? "", ...
}: { }: {
nativeBuildInputs = nativeBuildInputs ++ [ rosSelf.pythonPackages.sip ]; nativeBuildInputs = nativeBuildInputs ++ [ self.makeWrapper ];
# Prevent /build RPATH references postFixup = ''
preFixup = "rm -r devel/lib"; wrapProgram $out/bin/rviz \
--prefix QT_PLUGIN_PATH : "${self.qt5.qtbase.bin}/${self.qt5.qtbase.qtPluginPrefix}"
'' + postFixup;
}); });
rqt-gui = rosSuper.rqt-gui.overrideDerivation ({ rqt-gui = rosSuper.rqt-gui.overrideDerivation ({
@ -118,7 +131,7 @@ self: super: with self.lib; let
postFixup = '' postFixup = ''
wrapProgram $out/bin/rqt \ wrapProgram $out/bin/rqt \
--set QT_PLUGIN_PATH "${self.qt5.qtbase.bin}/${self.qt5.qtbase.qtPluginPrefix}" --prefix QT_PLUGIN_PATH : "${self.qt5.qtbase.bin}/${self.qt5.qtbase.qtPluginPrefix}"
'' + postFixup; '' + postFixup;
}); });