From b673be833616a92677fb3fdffa8e1a85c74af1d0 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 24 Feb 2021 14:54:25 +0100
Subject: [PATCH] emacsPackagesFor: Internalise trivialBuild/melpaBuild

I want less strangeness that's not obviously overrideable.
---
 pkgs/top-level/all-packages.nix   |  8 --------
 pkgs/top-level/emacs-packages.nix | 10 ++++++++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 157064f58c5..1790312c731 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21952,14 +21952,6 @@ in
     inherit fetchFromGitHub fetchurl;
     inherit emacs texinfo makeWrapper runCommand writeText;
     inherit (xorg) lndir;
-
-    trivialBuild = callPackage ../build-support/emacs/trivial.nix {
-      inherit emacs;
-    };
-
-    melpaBuild = callPackage ../build-support/emacs/melpa.nix {
-      inherit emacs;
-    };
   };
 
   inherit (gnome3) empathy;
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index c883a5fd549..076e67a1e74 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -35,14 +35,20 @@
 { lib, newScope, stdenv, fetchurl, fetchFromGitHub, runCommand, writeText
 
 , emacs, texinfo, lndir, makeWrapper
-, trivialBuild
-, melpaBuild
 
 , pkgs
 }:
 
 let
 
+  trivialBuild = pkgs.callPackage ../build-support/emacs/trivial.nix {
+    inherit emacs;
+  };
+
+  melpaBuild = pkgs.callPackage ../build-support/emacs/melpa.nix {
+    inherit emacs;
+  };
+
   mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
     inherit lib stdenv texinfo writeText;
   };