colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #127980 from matthewbauer/darwin-emacs-native-comp

Browse Source 
Add gcc for emacs wrapper so native-comp works
This commit is contained in:
Matthew Bauer 2021-07-15 20:03:57 -05:00 committed by GitHub
commit ff327f36db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
View File

@ -21,7 +21,7 @@ formats commits for you.
*/ */
{ lib, stdenv, texinfo, writeText }: { lib, stdenv, texinfo, writeText, gcc }:
self: let self: let
@ -32,7 +32,7 @@ self: let
}; };
elpaBuild = import ../../../../build-support/emacs/elpa.nix { elpaBuild = import ../../../../build-support/emacs/elpa.nix {
inherit lib stdenv texinfo writeText; inherit lib stdenv texinfo writeText gcc;
inherit (self) emacs; inherit (self) emacs;
}; };

4
pkgs/build-support/emacs/elpa.nix
View File

@ -1,6 +1,6 @@
# builder for Emacs packages built for packages.el # builder for Emacs packages built for packages.el
{ lib, stdenv, emacs, texinfo, writeText }: { lib, stdenv, emacs, texinfo, writeText, gcc }:
with lib; with lib;
@ -19,7 +19,7 @@ let
in in
import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
phases = "installPhase fixupPhase distPhase"; phases = "installPhase fixupPhase distPhase";

4
pkgs/build-support/emacs/generic.nix
View File

@ -1,6 +1,6 @@
# generic builder for Emacs packages # generic builder for Emacs packages
{ lib, stdenv, emacs, texinfo, writeText, ... }: { lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
with lib; with lib;
@ -72,6 +72,8 @@ stdenv.mkDerivation ({
LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
nativeBuildInputs = [ gcc ];
addEmacsNativeLoadPath = true; addEmacsNativeLoadPath = true;
postInstall = '' postInstall = ''

4
pkgs/build-support/emacs/melpa.nix
View File

@ -1,7 +1,7 @@
# builder for Emacs packages built for packages.el # builder for Emacs packages built for packages.el
# using MELPA package-build.el # using MELPA package-build.el
{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }: { lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText, gcc }:
with lib; with lib;
@ -28,7 +28,7 @@ let
in in
import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
ename = ename =
if ename == null if ename == null

7
pkgs/build-support/emacs/wrapper.nix
View File

@ -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; with lib;
@ -65,7 +65,10 @@ runCommand
# Store all paths we want to add to emacs here, so that we only need to add # Store all paths we want to add to emacs here, so that we only need to add
# one path to the load lists # one path to the load lists
deps = runCommand "emacs-packages-deps" deps = runCommand "emacs-packages-deps"
{ inherit explicitRequires lndir emacs; } {
inherit explicitRequires lndir emacs;
nativeBuildInputs = lib.optional nativeComp gcc;
}
'' ''
findInputsOld() { findInputsOld() {
local pkg="$1"; shift local pkg="$1"; shift

4
pkgs/top-level/emacs-packages.nix
View File

@ -26,7 +26,7 @@
let let
mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix { mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix {
inherit (pkgs) stdenv texinfo writeText; inherit (pkgs) stdenv texinfo writeText gcc;
inherit lib; inherit lib;
}; };
@ -44,7 +44,7 @@ let
}; };
emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix { emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix {
inherit (pkgs) makeWrapper runCommand; inherit (pkgs) makeWrapper runCommand gcc;
inherit (pkgs.xorg) lndir; inherit (pkgs.xorg) lndir;
inherit lib; inherit lib;
}; };