From 6847a5c12dd59e29dbc939967646ba5ee3fe4537 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 24 Nov 2020 02:55:40 +0100
Subject: [PATCH] referencesByPopularity: Don't use buildPackages at call-site

It's cleaner to reference buildPackages directly in
build-support/docker directly.
---
 pkgs/build-support/docker/default.nix | 3 +--
 pkgs/top-level/all-packages.nix       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index e4e8f794bc4c..4da26ba7cfda 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -15,7 +15,6 @@
   moreutils,
   nix,
   pigz,
-  referencesByPopularity,
   rsync,
   runCommand,
   runtimeShell,
@@ -772,7 +771,7 @@ rec {
             then tag
             else
               lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath));
-        paths = referencesByPopularity overallClosure;
+        paths = buildPackages.referencesByPopularity overallClosure;
         nativeBuildInputs = [ jq ];
       } ''
         ${if (tag == null) then ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d01c7d662c9b..92e68417e479 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -511,7 +511,7 @@ in
 
   nukeReferences = callPackage ../build-support/nuke-references { };
 
-  referencesByPopularity = buildPackages.callPackage ../build-support/references-by-popularity { };
+  referencesByPopularity = callPackage ../build-support/references-by-popularity { };
 
   removeReferencesTo = callPackage ../build-support/remove-references-to { };