diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2022-04-22 08:35:46 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-22 08:35:46 -0500 |
commit | 8656bc3e478fa1b615a6e99c29f1c3f59c6c3531 (patch) | |
tree | 49ae5660402c4fa6c33a59e5b1e659b97b41c99f /pkgs | |
parent | a0128ba47923ff5d946a26b9b010225c5db1aac3 (diff) | |
parent | f73ff5c2298a14ea1dc1722cb15cf94b3b879281 (diff) | |
download | nixpkgs-8656bc3e478fa1b615a6e99c29f1c3f59c6c3531.tar nixpkgs-8656bc3e478fa1b615a6e99c29f1c3f59c6c3531.tar.gz nixpkgs-8656bc3e478fa1b615a6e99c29f1c3f59c6c3531.tar.bz2 nixpkgs-8656bc3e478fa1b615a6e99c29f1c3f59c6c3531.tar.lz nixpkgs-8656bc3e478fa1b615a6e99c29f1c3f59c6c3531.tar.xz nixpkgs-8656bc3e478fa1b615a6e99c29f1c3f59c6c3531.tar.zst nixpkgs-8656bc3e478fa1b615a6e99c29f1c3f59c6c3531.zip |
Merge pull request #169779 from marsam/fix-emacsWrapper-darwin
emacsWrapper: add missing variable substitutions to Darwin app
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/emacs/wrapper.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 2bf8eaf2d7a..d61f6967c4b 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -227,6 +227,8 @@ runCommand substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \ --subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \ + --subst-var-by autoloadExpression "-l cl-loaddefs -l nix-generated-autoload" \ --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs fi |