emacsPackagesFor: Internalise trivialBuild/melpaBuild

I want less strangeness that's not obviously overrideable.
2021-02-24 15:40:58 +01:00
parent 9647372202
commit b673be8336
2 changed files with 8 additions and 10 deletions
@@ -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;
  };