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

Revert "distro-overlay: use pythonPackagesExtensions"

Browse source 
This reverts commit 2632a16e77.
This commit is contained in:
Ben Wolsieffer 2024-07-21 19:50:15 -04:00
parent 4fb038f771
commit c7e6f7c7dd
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
distros/distro-overlay.nix
View file

@ -1,6 +1,15 @@
{ version, distro, python }: { version, distro, python }:
self: super: self: super:
let 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: { base = rosSelf: rosSuper: {
recurseForDerivations = true; recurseForDerivations = true;
lib = super.lib // import ../lib { inherit self rosSelf; }; lib = super.lib // import ../lib { inherit self rosSelf; };
@ -16,14 +25,11 @@ let
inherit (self) buildEnv; inherit (self) buildEnv;
}; };
pythonPackagesExtensions = super.pythonPackagesExtensions ++ [ python = pythonOverridesFor python;
(pyFinal: pyPrev: { pythonPackages = rosSelf.python.pkgs;
wxPython = pyFinal.wxPython_4_2;
# ROS is not compatible with empy 4 python3 = pythonOverridesFor self.python3;
empy = pyFinal.empy_3; python3Packages = rosSelf.python3.pkgs;
})
];
boost = self.boost.override { boost = self.boost.override {
python = rosSelf.python; python = rosSelf.python;