From 2fdc733e0d38b404c17d0f2479eedc59674dece9 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Sat, 8 Mar 2025 12:46:42 +0100
Subject: [PATCH] noetic: Apply distutils overrides on top of manual overrides

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.
---
 distros/noetic/overrides.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/distros/noetic/overrides.nix b/distros/noetic/overrides.nix
index 470e426ba5..9b60b36701 100644
--- a/distros/noetic/overrides.nix
+++ b/distros/noetic/overrides.nix
@@ -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}))
+]