diff --git a/distros/build-ros-package/default.nix b/distros/build-ros-package/default.nix index bbab9088d6..ebc2fed1d4 100644 --- a/distros/build-ros-package/default.nix +++ b/distros/build-ros-package/default.nix @@ -2,10 +2,6 @@ { buildType ? "catkin" # Too difficult to fix all the problems with the tests in each package , 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 # 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 @@ -20,7 +16,8 @@ (if buildType == "ament_python" then pythonPackages.buildPythonPackage 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 # packages that use Eigen