mirror of
https://github.com/wentasah/ros2nix.git
synced 2025-06-10 00:02:23 +03:00
Generate correct paths when setting --output-dir
This commit is contained in:
parent
f1ab404292
commit
a56e2bdf9c
1 changed files with 5 additions and 4 deletions
|
@ -63,14 +63,15 @@ def get_output_file_name(source: str, pkg: Package, args):
|
||||||
return os.path.join(dir, fn)
|
return os.path.join(dir, fn)
|
||||||
|
|
||||||
def generate_overlay(expressions: dict[str, str], args):
|
def generate_overlay(expressions: dict[str, str], args):
|
||||||
with open("overlay.nix", "w") as f:
|
with open(f'{args.output_dir or "."}/overlay.nix', "w") as f:
|
||||||
print("self: super:\n{", file=f)
|
print("self: super:\n{", file=f)
|
||||||
for pkg in sorted(expressions):
|
for pkg in sorted(expressions):
|
||||||
print(f" {pkg} = super.callPackage {expressions[pkg]} {{}};", file=f)
|
expr = expressions[pkg] if args.output_dir is None else f"./{os.path.basename(expressions[pkg])}"
|
||||||
|
print(f" {pkg} = super.callPackage {expr} {{}};", file=f)
|
||||||
print("}", file=f)
|
print("}", file=f)
|
||||||
|
|
||||||
def generate_default(args):
|
def generate_default(args):
|
||||||
with open("default.nix", "w") as f:
|
with open(f'{args.output_dir or "."}/default.nix', "w") as f:
|
||||||
f.write('''{
|
f.write('''{
|
||||||
nix-ros-overlay ? builtins.fetchTarball "https://github.com/lopsided98/nix-ros-overlay/archive/master.tar.gz",
|
nix-ros-overlay ? builtins.fetchTarball "https://github.com/lopsided98/nix-ros-overlay/archive/master.tar.gz",
|
||||||
}:
|
}:
|
||||||
|
@ -215,7 +216,7 @@ def ros2nix(args):
|
||||||
if args.output_dir is None:
|
if args.output_dir is None:
|
||||||
kwargs["src_expr"] = "./."
|
kwargs["src_expr"] = "./."
|
||||||
else:
|
else:
|
||||||
kwargs["src_expr"] = f"./{os.path.dirname(source)}"
|
kwargs["src_expr"] = f"./{os.path.relpath(os.path.dirname(source), args.output_dir)}"
|
||||||
|
|
||||||
if args.source_root:
|
if args.source_root:
|
||||||
kwargs["source_root"] = args.source_root.replace('{package_name}', pkg.name)
|
kwargs["source_root"] = args.source_root.replace('{package_name}', pkg.name)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue