From bc71b936bffb9dad05776a6c62e6988c4b392bf3 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 29 May 2021 19:55:01 -0400 Subject: [PATCH] Override to use SIP 4 by default --- pkgs/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index 5163389dca..130ba24f24 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -35,9 +35,15 @@ self: super: with super.lib; let rosinstall-generator = pySelf.callPackage ./rosinstall-generator { }; rospkg = pySelf.callPackage ./rospkg { }; + + # These overrides have to be done here (rather than in rosPackages) + # because packageOverrides doesn't compose + + # ROS packages are generally transitioning away from SIP, so they usually + # aren't compatible with the latest SIP. This situation is somewhat in + # flux, so it is easier to do it here than in rosdep. + sip = pySelf.sip_4; } // optionalAttrs pySuper.isPy3k { - # This has to be done here (rather than in rosPackages) because - # packageOverrides doesn't compose wxPython = pySelf.wxPython_4_0; }; });