From 71273618d610abe9a64cc81d06b390d167b0a207 Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Wed, 22 Apr 2020 13:58:57 +0200 Subject: [PATCH] Fix label construction for nix file dependencies PR #123 fixed #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. --- nixpkgs/nixpkgs.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixpkgs/nixpkgs.bzl b/nixpkgs/nixpkgs.bzl index d75e686fe..4894a4456 100644 --- a/nixpkgs/nixpkgs.bzl +++ b/nixpkgs/nixpkgs.bzl @@ -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.