diff --git a/flake.lock b/flake.lock index 7957de2..2ac7773 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1734611049, - "narHash": "sha256-zIXvTRV0sjO2KTG6JgFaeOwqmYVruIGm4Q57ncrm1JU=", + "lastModified": 1733998607, + "narHash": "sha256-XW1j5WF2jwb7dAbIrbARAmOjhZcxOm2saMqtN9os5dc=", "owner": "RandomSpaceship", "repo": "nix-ros-workspace", - "rev": "38e8fb4a4b656312a52ee2f6543dae9c51c97eb2", + "rev": "8808ff5ee433d0d9cf4df42806d6997ff01db1e5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8a7848c..f567822 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { # ros inputs + # TODO: Currently can't be updated till after issue #540 is resolved nix-ros-overlay.url = "github:lopsided98/nix-ros-overlay"; nixpkgs.follows = "nix-ros-overlay/nixpkgs"; # IMPORTANT!!! nix-ros-workspace = { @@ -112,8 +113,9 @@ inherit (pkgs) man-pages man-pages-posix stdmanpages; }; # Packages needed to run the simulation - simPkgs = { - }; + simPkgs = + { + }; # --- ROS WORKSPACES --- # function to build a ROS workspace which modifies the dev shell hook to set up environment variables @@ -124,21 +126,14 @@ additionalPkgs ? { }, }: let - workspace = ( - ros.callPackage ros.buildROSWorkspace { - inherit devPackages name; - prebuiltPackages = standardPkgs // additionalPkgs; - prebuiltShellPackages = devShellPkgs // formatters; - releaseDomainId = productionDomainId; - environmentDomainId = devDomainId; - forceReleaseDomainId = true; - - # enable coloured ros2 launch output - postShellHook = '' - export RCUTILS_COLORIZED_OUTPUT=1 - ''; - } - ); + workspace = ros.callPackage ros.buildROSWorkspace { + inherit devPackages name; + prebuiltPackages = standardPkgs // additionalPkgs; + prebuiltShellPackages = devShellPkgs // formatters; + releaseDomainId = productionDomainId; + environmentDomainId = devDomainId; + forceReleaseDomainId = true; + }; in # override the env attribute (cli environment) with our modifications workspace;