From 0f06d94a206d9697bc6c4a6e5b592a9921deef2b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 7 Jan 2021 10:05:51 +0000 Subject: [PATCH] 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") --- pkgs/build-support/emacs/wrapper.nix | 4 ---- 1 file changed, 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