Revert "distro-overlay: use pythonPackagesExtensions"

This reverts commit 2632a16e77.
This commit is contained in:
Ben Wolsieffer 2024-07-21 19:50:15 -04:00
parent 4fb038f771
commit c7e6f7c7dd

View file

@ -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;