diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2021-06-12 11:21:35 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2021-06-23 23:02:11 -0500 |
commit | 8bc10fbc56db2aaf1f234349e4d0c7607b8ead4f (patch) | |
tree | 9260c3b8fdf1505258baa6d421de8a971dd3e4b8 /pkgs/build-support/emacs/wrapper.nix | |
parent | 65db0350fe3962c41b8604046ec9166976f80793 (diff) |
Add gcc for emacs wrapper so native-comp works
On macos, we don’t have a gcc executable by default, which is required for some reason when compiling site-start.
Diffstat (limited to 'pkgs/build-support/emacs/wrapper.nix')
-rw-r--r-- | pkgs/build-support/emacs/wrapper.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 571d0eb687ce5..6b53f3fdd9542 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -32,7 +32,7 @@ in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit */ -{ lib, lndir, makeWrapper, runCommand }: self: +{ lib, lndir, makeWrapper, runCommand, gcc }: self: with lib; @@ -65,7 +65,10 @@ runCommand # Store all paths we want to add to emacs here, so that we only need to add # one path to the load lists deps = runCommand "emacs-packages-deps" - { inherit explicitRequires lndir emacs; } + { + inherit explicitRequires lndir emacs; + nativeBuildInputs = lib.optional nativeComp gcc; + } '' findInputsOld() { local pkg="$1"; shift |