diff --git a/ros2nix/ros2nix.py b/ros2nix/ros2nix.py index 8bf2190..a0dc3bf 100755 --- a/ros2nix/ros2nix.py +++ b/ros2nix/ros2nix.py @@ -2,7 +2,7 @@ # PYTHON_ARGCOMPLETE_OK # Copyright 2019-2024 Ben Wolsieffer -# Copyright 2024 Michal Sojka +# Copyright 2024, 2025 Michal Sojka from os.path import dirname import argcomplete, argparse @@ -105,9 +105,9 @@ def generate_overlay(expressions: dict[str, str], args): expr = ( expressions[pkg] if args.output_dir is None - else f"./{os.path.basename(expressions[pkg])}" + else os.path.basename(expressions[pkg]) ) - print(f" {pkg} = final.callPackage {expr} {{}};", file=f) + print(f" {pkg} = final.callPackage ./{expr} {{}};", file=f) print("}", file=f) diff --git a/test/test.bats b/test/test.bats index abdf2b3..ad29f08 100644 --- a/test/test.bats +++ b/test/test.bats @@ -18,6 +18,12 @@ load common.bash nix-build -A rosPackages.humble.ros-node -A rosPackages.jazzy.ros-node -A rosPackages.rolling.ros-node } +@test "nixify package in the current directory" { + cd ws/src/library + ros2nix package.xml + nix-build -A rosPackages.jazzy.library +} + @test "--output-as-nix-pkg-name" { ros2nix --output-as-nix-pkg-name $(find ws/src -name package.xml) assert [ -f ros-node.nix ]