From d363da72cc8e102d46af74c2eb9aa7bb839b5174 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Thu, 11 Jul 2019 17:10:55 +0200 Subject: [PATCH] bazel: Use --distdir for prefetched repositories --distdir is now used in the installCheckPhase for prefetched repositories. That's simpler, more robust and easier to extend in the future. Note that `name` argument of fetchurl was removed because it changed the basename of the generated file and bazel uses this basename for its cache behavior. --- .../tools/build-managers/bazel/default.nix | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index bad0023eef3..8d7a8199240 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -33,7 +33,6 @@ let let srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { - name = d.name; urls = d.urls; sha256 = d.sha256; }); @@ -339,8 +338,8 @@ stdenv.mkDerivation rec { # add nix environment vars to .bazelrc cat >> .bazelrc <