mirror of
https://github.com/lopsided98/nix-ros-overlay.git
synced 2025-06-11 18:24:50 +03:00
Fix rviz.
This commit is contained in:
parent
c10dbc2e9a
commit
b10d6c48e1
2 changed files with 20 additions and 7 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1 +1 @@
|
||||||
result-*
|
result
|
||||||
|
|
|
@ -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;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue