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

buildRosPackage: always set strictDeps

Browse source 
Hopefully this should work now.
This commit is contained in:
Ben Wolsieffer 2022-09-20 17:42:34 -04:00
parent 6c0dc51a4b
commit 4e948112f2
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
distros/build-ros-package/default.nix
View file

@ -2,10 +2,6 @@
{ buildType ? "catkin" { buildType ? "catkin"
# Too difficult to fix all the problems with the tests in each package # Too difficult to fix all the problems with the tests in each package
, doCheck ? false , doCheck ? false
# ROS is sloppy with specifying build/runtime dependencies and
# buildPythonPackage turns on strictDeps by default
# FIXME: figure out a way to avoid this to eventually allow cross-compiling
, strictDeps ? false
# nixpkgs requires that either dontWrapQtApps is set or wrapQtAppsHook is added # nixpkgs requires that either dontWrapQtApps is set or wrapQtAppsHook is added
# to nativeBuildInputs if a package depends on Qt5. This is difficult to achieve # to nativeBuildInputs if a package depends on Qt5. This is difficult to achieve
# with auto-generated packages, so we just always disable wrapping except for # with auto-generated packages, so we just always disable wrapping except for
@ -20,7 +16,8 @@
(if buildType == "ament_python" then pythonPackages.buildPythonPackage (if buildType == "ament_python" then pythonPackages.buildPythonPackage
else stdenv.mkDerivation) (args // { else stdenv.mkDerivation) (args // {
inherit doCheck strictDeps dontWrapQtApps; inherit doCheck dontWrapQtApps;
strictDeps = true;
# Disable warnings that cause "Log limit exceeded" errors on Hydra in lots of # Disable warnings that cause "Log limit exceeded" errors on Hydra in lots of
# packages that use Eigen # packages that use Eigen