mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 17:39:34 +00:00
Revert "Merge pull request #17806 from matthewbauer/emacs-wrapper"
This reverts commitda68127737
, reversing changes made to2ba494b728
. These changes are reverted because they cause an incompatibility which they should not.
This commit is contained in:
parent
4574f22841
commit
64ba7b53f1
pkgs
|
@ -36,10 +36,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
|
||||||
|
|
||||||
with lib; let inherit (self) emacs; in
|
with lib; let inherit (self) emacs; in
|
||||||
|
|
||||||
{
|
packagesFun: # packages explicitly requested by the user
|
||||||
packagesFun ? [], # packages explicitly requested by the user
|
|
||||||
extraStart ? ""
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
explicitRequires =
|
explicitRequires =
|
||||||
|
@ -56,7 +53,7 @@ stdenv.mkDerivation {
|
||||||
# Store all paths we want to add to emacs here, so that we only need to add
|
# Store all paths we want to add to emacs here, so that we only need to add
|
||||||
# one path to the load lists
|
# one path to the load lists
|
||||||
deps = runCommand "emacs-packages-deps"
|
deps = runCommand "emacs-packages-deps"
|
||||||
{ inherit explicitRequires lndir emacs extraStart; }
|
{ inherit explicitRequires lndir emacs; }
|
||||||
''
|
''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
mkdir -p $out/share/emacs/site-lisp
|
mkdir -p $out/share/emacs/site-lisp
|
||||||
|
@ -99,7 +96,6 @@ stdenv.mkDerivation {
|
||||||
(load-file "$emacs/share/emacs/site-lisp/site-start.el")
|
(load-file "$emacs/share/emacs/site-lisp/site-start.el")
|
||||||
(add-to-list 'load-path "$out/share/emacs/site-lisp")
|
(add-to-list 'load-path "$out/share/emacs/site-lisp")
|
||||||
(add-to-list 'exec-path "$out/bin")
|
(add-to-list 'exec-path "$out/bin")
|
||||||
$extraStart
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Byte-compiling improves start-up time only slightly, but costs nothing.
|
# Byte-compiling improves start-up time only slightly, but costs nothing.
|
||||||
|
|
|
@ -63,7 +63,7 @@ let
|
||||||
inherit fetchurl lib stdenv texinfo;
|
inherit fetchurl lib stdenv texinfo;
|
||||||
};
|
};
|
||||||
|
|
||||||
emacsWrapper = import ../build-support/emacs/wrapper.nix {
|
emacsWithPackages = import ../build-support/emacs/wrapper.nix {
|
||||||
inherit lib lndir makeWrapper stdenv runCommand;
|
inherit lib lndir makeWrapper stdenv runCommand;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -71,9 +71,7 @@ let
|
||||||
|
|
||||||
inherit emacs melpaBuild trivialBuild;
|
inherit emacs melpaBuild trivialBuild;
|
||||||
|
|
||||||
emacsWrapper = emacsWrapper self;
|
emacsWithPackages = emacsWithPackages self;
|
||||||
|
|
||||||
emacsWithPackages = packagesFun: emacsWrapper { inherit packagesFun; };
|
|
||||||
|
|
||||||
## START HERE
|
## START HERE
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue