From c7e6f7c7dd4f0dea1ecac0afade757aaa14b08d8 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 21 Jul 2024 19:50:15 -0400
Subject: [PATCH] Revert "distro-overlay: use pythonPackagesExtensions"

This reverts commit 2632a16e77522bde59c2529b59db6c833d7b2e1c.
---
 distros/distro-overlay.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
index b10118f3f9..7b61b26309 100644
--- a/distros/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -1,6 +1,15 @@
 { version, distro, python }:
 self: super:
 let
+  pythonOverridesFor = with self.lib; prevPython: prevPython // {
+    pkgs = prevPython.pkgs.overrideScope (pyFinal: pyPrev: {
+      wxPython = pyFinal.wxPython_4_2;
+
+      # ROS is not compatible with empy 4
+      empy = pyFinal.empy_3;
+    });
+  };
+
   base = rosSelf: rosSuper: {
     recurseForDerivations = true;
     lib = super.lib // import ../lib { inherit self rosSelf; };
@@ -16,14 +25,11 @@ let
       inherit (self) buildEnv;
     };
 
-    pythonPackagesExtensions = super.pythonPackagesExtensions ++ [
-      (pyFinal: pyPrev: {
-        wxPython = pyFinal.wxPython_4_2;
+    python = pythonOverridesFor python;
+    pythonPackages = rosSelf.python.pkgs;
 
-        # ROS is not compatible with empy 4
-        empy = pyFinal.empy_3;
-      })
-    ];
+    python3 = pythonOverridesFor self.python3;
+    python3Packages = rosSelf.python3.pkgs;
 
     boost = self.boost.override {
       python = rosSelf.python;