diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-22 18:01:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-22 18:01:54 +0000 |
| commit | 05f9abf2941c30956bfabdc9e188b3d6955da42e (patch) | |
| tree | 0cee8c75583a7b1d1c171042aad8d400aa3e2cd7 /pkgs/build-support | |
| parent | 785373a76f64cc24ac7b43d6b84d7ec399bc0968 (diff) | |
| parent | c7ccbd29a6b14bcf887fc082e28ab40e071c64b6 (diff) | |
| download | nixpkgs-05f9abf2941c30956bfabdc9e188b3d6955da42e.tar nixpkgs-05f9abf2941c30956bfabdc9e188b3d6955da42e.tar.gz nixpkgs-05f9abf2941c30956bfabdc9e188b3d6955da42e.tar.bz2 nixpkgs-05f9abf2941c30956bfabdc9e188b3d6955da42e.tar.lz nixpkgs-05f9abf2941c30956bfabdc9e188b3d6955da42e.tar.xz nixpkgs-05f9abf2941c30956bfabdc9e188b3d6955da42e.tar.zst nixpkgs-05f9abf2941c30956bfabdc9e188b3d6955da42e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -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 |