diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2021-07-15 20:03:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-15 20:03:57 -0500 |
| commit | ff327f36db14d51b8335b6d20be49f428203fdad (patch) | |
| tree | 6f5278db2677c15c25c20f86ed7d4c1560eb7669 /pkgs/build-support | |
| parent | 085084a3934c1e07c7da27bff0a2d5b48e054a44 (diff) | |
| parent | 82003f428c6c4a6912781545067d5da4bff4881a (diff) | |
| download | nixpkgs-ff327f36db14d51b8335b6d20be49f428203fdad.tar nixpkgs-ff327f36db14d51b8335b6d20be49f428203fdad.tar.gz nixpkgs-ff327f36db14d51b8335b6d20be49f428203fdad.tar.bz2 nixpkgs-ff327f36db14d51b8335b6d20be49f428203fdad.tar.lz nixpkgs-ff327f36db14d51b8335b6d20be49f428203fdad.tar.xz nixpkgs-ff327f36db14d51b8335b6d20be49f428203fdad.tar.zst nixpkgs-ff327f36db14d51b8335b6d20be49f428203fdad.zip | |
Merge pull request #127980 from matthewbauer/darwin-emacs-native-comp
Add gcc for emacs wrapper so native-comp works
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/emacs/elpa.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/emacs/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/emacs/melpa.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/emacs/wrapper.nix | 7 |
4 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 41a0670d0c8..965b8d8189a 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -1,6 +1,6 @@ # builder for Emacs packages built for packages.el -{ lib, stdenv, emacs, texinfo, writeText }: +{ lib, stdenv, emacs, texinfo, writeText, gcc }: with lib; @@ -19,7 +19,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ phases = "installPhase fixupPhase distPhase"; diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 1456d9e423d..ef154982ad0 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -1,6 +1,6 @@ # generic builder for Emacs packages -{ lib, stdenv, emacs, texinfo, writeText, ... }: +{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }: with lib; @@ -72,6 +72,8 @@ stdenv.mkDerivation ({ LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; + nativeBuildInputs = [ gcc ]; + addEmacsNativeLoadPath = true; postInstall = '' diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index c30d3e59906..408448f26a0 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -1,7 +1,7 @@ # builder for Emacs packages built for packages.el # using MELPA package-build.el -{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }: +{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText, gcc }: with lib; @@ -28,7 +28,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ ename = if ename == null diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 571d0eb687c..6b53f3fdd95 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 |