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

Fix overlays in NixOS module.

Browse source
This commit is contained in:
Ben Wolsieffer 2022-09-23 19:20:31 -04:00
parent 87396617b9
commit fc6be9ef7d
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/ros.nix
View file

@ -39,7 +39,7 @@ in {
overlays = mkOption { overlays = mkOption {
type = types.listOf overlayType; type = types.listOf overlayType;
default = []; default = [];
apply = foldr composeExtensions (_: _: {}); apply = composeManyExtensions;
description = '' description = ''
Set of package overlays to apply to ROS package set for the configured Set of package overlays to apply to ROS package set for the configured
distro. distro.
@ -83,7 +83,7 @@ in {
nixpkgs.overlays = mkAfter (singleton (import ../overlay.nix)); nixpkgs.overlays = mkAfter (singleton (import ../overlay.nix));
services.ros = { services.ros = {
pkgs = mkDefault (pkgs.rosPackages."${cfg.distro}".extend cfg.overlays); pkgs = mkDefault (pkgs.rosPackages."${cfg.distro}".overrideScope cfg.overlays);
hostname = mkDefault config.networking.hostName; hostname = mkDefault config.networking.hostName;
masterUri = mkDefault "http://${cfg.hostname}:11311/"; masterUri = mkDefault "http://${cfg.hostname}:11311/";