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

noetic: Apply distutils overrides on top of manual overrides

Browse source 
I need to override laser-geometry (see next commit), which also needs
the distutils override. In the current implementation the distutils
override replaces the manual override. With this change, both
overrides are composed.
This commit is contained in:
Michal Sojka 2025-03-08 12:46:42 +01:00 • committed by Ben Wolsieffer
parent 107adbda3b
commit 2fdc733e0d
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
distros/noetic/overrides.nix
View file

@ -1,7 +1,8 @@
# Top level package set
self:
self.lib.composeManyExtensions [
# Distro package set
rosSelf: rosSuper: let
(rosSelf: rosSuper: let
lib = rosSelf.lib;
in {
angles = rosSuper.angles.overrideAttrs ({
@ -201,10 +202,10 @@ in {
}) ];
});
} //
})
# distutils was removed from standard library in Python 3.12, but many packages
# still depend on it.
(let
(rosSelf: rosSuper: let
addDistutils = pkg: pkg.overrideAttrs ({
nativeBuildInputs ? [], ...
}: {
@ -267,3 +268,4 @@ in rosSuper.lib.genAttrs [
"turtlebot3-teleop"
"unique-id"
] (name: addDistutils rosSuper.${name}))
]