summary refs log tree commit diff
path: root/pkgs/build-support/emacs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-01-07 10:05:51 +0000
committerAlyssa Ross <hi@alyssa.is>2021-01-08 05:45:15 +0000
commit0f06d94a206d9697bc6c4a6e5b592a9921deef2b (patch)
tree1dbad7810d3b330cc426fdcb30eed96312d86658 /pkgs/build-support/emacs
parenta00f391174f1f4572b6b11cb25e071af30223c7b (diff)
downloadnixpkgs-0f06d94a206d9697bc6c4a6e5b592a9921deef2b.tar
nixpkgs-0f06d94a206d9697bc6c4a6e5b592a9921deef2b.tar.gz
nixpkgs-0f06d94a206d9697bc6c4a6e5b592a9921deef2b.tar.bz2
nixpkgs-0f06d94a206d9697bc6c4a6e5b592a9921deef2b.tar.lz
nixpkgs-0f06d94a206d9697bc6c4a6e5b592a9921deef2b.tar.xz
nixpkgs-0f06d94a206d9697bc6c4a6e5b592a9921deef2b.tar.zst
nixpkgs-0f06d94a206d9697bc6c4a6e5b592a9921deef2b.zip
emacs: fix accidental double wrapper (Darwin)
This was already fixed on non-Darwin, but the fix missed that it was
also reintroduced for the Darwin code path at the same time.

Fixes: dd5d2482c9d ("emacs: Fix accidental double wrapping")
Diffstat (limited to 'pkgs/build-support/emacs')
-rw-r--r--pkgs/build-support/emacs/wrapper.nix4
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index a3136839122..ddd15065663 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -203,10 +203,6 @@ runCommand
         --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
         --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
       chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
-
-      makeWrapper $emacs/Applications/Emacs.app/Contents/MacOS/Emacs $out/Applications/Emacs.app/Contents/MacOS/Emacs \
-        --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:" \
-        --suffix EMACSNATIVELOADPATH ":" "$deps/share/emacs/native-lisp:"
     fi
 
     mkdir -p $out/share