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

Cleanup Python package overrides.

Browse source
This commit is contained in:
Ben Wolsieffer 2023-02-26 14:44:09 -05:00
parent 3fa6f9fb54
commit b79845c4ed
5 changed files with 54 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/ros1/ros.nix
View file

@ -77,9 +77,9 @@ in {
# Implementation
config = mkIf cfg.enable {
# FIXME: mkAfter is used to make sure the Python overlay is applied. That
# means all other user configured Python overlays are ignored. This needs a
# fix in nixpkgs: https://github.com/NixOS/nixpkgs/issues/44426
# mkAfter is used to make sure the Python overlay (which uses overrideScope)
# is applied after any user overlays that use packageOverrides, so that
# composition works.
nixpkgs.overlays = mkAfter (singleton (import ../../overlay.nix));
services.ros = {

6
modules/ros2/ros.nix
View file

@ -69,9 +69,9 @@ in {
# Implementation
config = mkIf cfg.enable {
# FIXME: mkAfter is used to make sure the Python overlay is applied. That
# means all other user configured Python overlays are ignored. This needs a
# fix in nixpkgs: https://github.com/NixOS/nixpkgs/issues/44426
# mkAfter is used to make sure the Python overlay (which uses overrideScope)
# is applied after any user overlays that use packageOverrides, so that
# composition works.
nixpkgs.overlays = mkAfter (singleton (import ../../overlay.nix));
services.ros2.pkgs = mkDefault (pkgs.rosPackages."${cfg.distro}".overrideScope cfg.overlays);