public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacsPackagesFor: Internalise trivialBuild/melpaBuild

Browse Source 
I want less strangeness that's not obviously overrideable.
This commit is contained in:
adisbladis 2021-02-24 14:54:25 +01:00
parent 9647372202
commit b673be8336
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -21952,14 +21952,6 @@ in
inherit fetchFromGitHub fetchurl; inherit fetchFromGitHub fetchurl;
inherit emacs texinfo makeWrapper runCommand writeText; inherit emacs texinfo makeWrapper runCommand writeText;
inherit (xorg) lndir; inherit (xorg) lndir;
trivialBuild = callPackage ../build-support/emacs/trivial.nix {
inherit emacs;
};
melpaBuild = callPackage ../build-support/emacs/melpa.nix {
inherit emacs;
};
}; };
inherit (gnome3) empathy; inherit (gnome3) empathy;

10
pkgs/top-level/emacs-packages.nix
View File

@ -35,14 +35,20 @@
{ lib, newScope, stdenv, fetchurl, fetchFromGitHub, runCommand, writeText { lib, newScope, stdenv, fetchurl, fetchFromGitHub, runCommand, writeText
, emacs, texinfo, lndir, makeWrapper , emacs, texinfo, lndir, makeWrapper
, trivialBuild
, melpaBuild
, pkgs , pkgs
}: }:
let 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 { mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
inherit lib stdenv texinfo writeText; inherit lib stdenv texinfo writeText;
}; };