diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-16 20:53:12 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 09:31:41 -0600 |
| commit | dadfd93811c9ddef93024f164edef636bdd48481 (patch) | |
| tree | e9b3317d631d026ce66519975986d9a8820b0fbb /pkgs/top-level/emacs-packages.nix | |
| parent | 78d68b8c149d7c7a2f6f48d25ae61e5ec66212d7 (diff) | |
| download | nixlib-dadfd93811c9ddef93024f164edef636bdd48481.tar nixlib-dadfd93811c9ddef93024f164edef636bdd48481.tar.gz nixlib-dadfd93811c9ddef93024f164edef636bdd48481.tar.bz2 nixlib-dadfd93811c9ddef93024f164edef636bdd48481.tar.lz nixlib-dadfd93811c9ddef93024f164edef636bdd48481.tar.xz nixlib-dadfd93811c9ddef93024f164edef636bdd48481.tar.zst nixlib-dadfd93811c9ddef93024f164edef636bdd48481.zip | |
emacsWithPackages: know its own package set
Fixes #10819. emacsWithPackages will know its own package set. This requires it to be in a package set, rather than at the top level, so it lives in emacsPackagesNg.
Diffstat (limited to 'pkgs/top-level/emacs-packages.nix')
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 727ceb24c8a2..3a93a32d1609 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -35,7 +35,7 @@ , lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg -, emacs, texinfo +, emacs, texinfo, makeWrapper , trivialBuild , melpaBuild @@ -58,10 +58,16 @@ let inherit lib; }; + emacsWithPackages = import ../build-support/emacs/wrapper.nix { + inherit lib makeWrapper stdenv; + }; + packagesFun = self: with self; { inherit emacs melpaBuild trivialBuild; + emacsWithPackages = emacsWithPackages self; + ## START HERE ac-haskell-process = melpaBuild rec { |