Skip to content

Commit

Permalink
Fix label construction for nix file dependencies
Browse files Browse the repository at this point in the history
PR tweag#123 fixed tweag#113, but introduced a regression. The regression was
due to the label for the `nix_file_deps` files from the
`nixpkgs_local_repository` being constructed incorrectly.
  • Loading branch information
mboes committed Apr 22, 2020
1 parent 606a81f commit 7127361
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion nixpkgs/nixpkgs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def _nixpkgs_package_impl(repository_ctx):
for f in content.splitlines():
# Hack: this is to register all Nix files as dependencies
# of this rule (see issue #113)
repository_ctx.path(Label("@{}//:{}".format(path_name, f)))
repository_ctx.path(target.relative(":{}".format(f)))

# If repositories is not set, leave empty so nix will fail
# unless a pinned nixpkgs is set in the `nix_file` attribute.
Expand Down

0 comments on commit 7127361

Please sign in to comment.