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

Merge pull request #14429 from samuelrivas/avoid-conflicts-in-emacs-withpackages

Browse Source 
Avoid conflicts in emacs withpackages
This commit is contained in:
Thomas Tuegel 2016-04-04 07:39:35 -05:00
commit c74cbb824b
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/build-support/emacs/wrapper.nix
View File

@ -51,8 +51,11 @@ stdenv.mkDerivation {
inherit emacs explicitRequires; inherit emacs explicitRequires;
phases = [ "installPhase" ]; phases = [ "installPhase" ];
installPhase = '' installPhase = ''
mkdir -p $out/bin readonly SHARE="share/emacs-with-packages"
mkdir -p $out/share/emacs/site-lisp
mkdir -p "$out/bin"
mkdir -p "$out/$SHARE/bin"
mkdir -p "$out/$SHARE/site-lisp"
local requires local requires
for pkg in $explicitRequires; do for pkg in $explicitRequires; do
@ -60,29 +63,32 @@ stdenv.mkDerivation {
done done
# requires now holds all requested packages and their transitive dependencies # requires now holds all requested packages and their transitive dependencies
siteStart="$out/share/emacs/site-lisp/site-start.el" siteStart="$out/$SHARE/site-lisp/site-start.el"
# Begin the new site-start.el by loading the original, which sets some # 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 # 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. # they are specified in, so user and system profile paths are searched last.
cat >"$siteStart" <<EOF cat >"$siteStart" <<EOF
(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/site-lisp")
(add-to-list 'exec-path "$out/$SHARE/bin")
EOF EOF
linkPath() { linkPath() {
local pkg=$1 local pkg=$1
local path=$2 local origin_path=$2
local dest_path=$3
# Add the path to the search path list, but only if it exists # Add the path to the search path list, but only if it exists
if [[ -d "$pkg/$path" ]]; then if [[ -d "$pkg/$origin_path" ]]; then
lndir -silent "$pkg/$path" "$out/$path" lndir -silent "$pkg/$origin_path" "$out/$dest_path"
fi fi
} }
# Add a package's paths to site-start.el # Add a package's paths to site-start.el
linkEmacsPackage() { linkEmacsPackage() {
linkPath "$1" "bin" linkPath "$1" "bin" "$SHARE/bin"
linkPath "$1" "share/emacs/site-lisp" linkPath "$1" "share/emacs/site-lisp" "$SHARE/site-lisp"
} }
# First, link all the explicitly-required packages. # First, link all the explicitly-required packages.
@ -103,7 +109,7 @@ EOF
local progname=$(basename "$prog") local progname=$(basename "$prog")
rm -f "$out/bin/$progname" rm -f "$out/bin/$progname"
makeWrapper "$prog" "$out/bin/$progname" \ makeWrapper "$prog" "$out/bin/$progname" \
--suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:" --suffix EMACSLOADPATH ":" "$out/$SHARE/site-lisp:"
done done
mkdir -p $out/share mkdir -p $out/share