diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index dc4ff03f9e7..efee43d852e 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -32,7 +32,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ]) */ -{ lib, makeWrapper, stdenv }: self: +{ lib, lndir, makeWrapper, stdenv }: self: with lib; let inherit (self) emacs; in @@ -47,11 +47,14 @@ in stdenv.mkDerivation { name = (appendToName "with-packages" emacs).name; - nativeBuildInputs = [ emacs makeWrapper ]; + nativeBuildInputs = [ emacs lndir makeWrapper ]; inherit emacs explicitRequires; phases = [ "installPhase" ]; installPhase = '' - requires="" + mkdir -p $out/bin + mkdir -p $out/share/emacs/site-lisp + + local requires for pkg in $explicitRequires; do findInputs $pkg requires propagated-user-env-packages done @@ -59,52 +62,47 @@ stdenv.mkDerivation { siteStart="$out/share/emacs/site-lisp/site-start.el" - addEmacsPath() { - local list=$1 - local path=$2 - # Add the path to the search path list, but only if it exists - if [[ -d "$path" ]]; then - echo "(add-to-list '$list \"$path\")" >>"$siteStart" - fi - } - - # Add a dependency's paths to site-start.el - addToEmacsPaths() { - addEmacsPath "exec-path" "$1/bin" - addEmacsPath "load-path" "$1/share/emacs/site-lisp" - addEmacsPath "package-directory-list" "$1/share/emacs/site-lisp/elpa" - } - - mkdir -p $out/share/emacs/site-lisp # Begin the new site-start.el by loading the original, which sets some # NixOS-specific paths. Paths are searched in the reverse of the order # they are specified in, so user and system profile paths are searched last. - echo "(load-file \"$emacs/share/emacs/site-lisp/site-start.el\")" >"$siteStart" - echo "(require 'package)" >>"$siteStart" + cat >"$siteStart" </dev/null ) ; then - addToEmacsPaths $pkg + linkPath() { + local pkg=$1 + local path=$2 + # Add the path to the search path list, but only if it exists + if [[ -d "$pkg/$path" ]]; then + lndir -silent "$pkg/$path" "$out/$path" fi + } + + # Add a package's paths to site-start.el + linkEmacsPackage() { + linkPath "$1" "bin" + linkPath "$1" "share/emacs/site-lisp" + } + + # First, link all the explicitly-required packages. + for pkg in $explicitRequires; do + linkEmacsPackage $pkg done - # Finally, add paths for all the explicitly-required packages. These paths - # will be searched first. - for pkg in $explicitRequires; do - addToEmacsPaths $pkg + # Next, link all the dependencies. + for pkg in $requires; do + linkEmacsPackage $pkg done # Byte-compiling improves start-up time only slightly, but costs nothing. emacs --batch -f batch-byte-compile "$siteStart" - mkdir -p $out/bin # Wrap emacs and friends so they find our site-start.el before the original. for prog in $emacs/bin/*; do # */ - makeWrapper "$prog" $out/bin/$(basename "$prog") \ + local progname=$(basename "$prog") + rm -f "$out/bin/$progname" + makeWrapper "$prog" "$out/bin/$progname" \ --suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:" done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e425bdab138..13a47c481e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11794,6 +11794,7 @@ let inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl; inherit emacs texinfo makeWrapper; + inherit (xorg) lndir; trivialBuild = callPackage ../build-support/emacs/trivial.nix { inherit emacs; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 0bd7b0efad3..896e324c51b 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -36,7 +36,7 @@ , lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg -, emacs, texinfo, makeWrapper +, emacs, texinfo, lndir, makeWrapper , trivialBuild , melpaBuild @@ -60,7 +60,7 @@ let }; emacsWithPackages = import ../build-support/emacs/wrapper.nix { - inherit lib makeWrapper stdenv; + inherit lib lndir makeWrapper stdenv; }; packagesFun = self: with self; {