Commit Graph

132 Commits

Author SHA1 Message Date
adisbladis
14154fea52
Revert "emacs: Remove references from emacs.pdmp"
This reverts commit 8e13d34944.

It turns out this breaks the build of emacsGit from the nix-community overlay.
2020-10-06 01:14:24 +02:00
Eelco Dolstra
8e13d34944 emacs: Remove references from emacs.pdmp
This reduces the Emacs closure size from 1324 MiB to 424 MiB.

Fixes #98755.
2020-10-01 09:53:02 +02:00
Anthony Cowley
30313a797d emacs: fix paths for native compilation
The given paths gives rise to errors such as,

```
x86_64-unknown-linux-gnu-gcc-9.3.0: fatal error: cannot execute ‘as’: execvp: No such file or directory
compilation terminated.
```

in the `*Async-native-compile-log*` buffer.

Fixes <https://github.com/nix-community/emacs-overlay/issues/69>
2020-09-24 14:54:36 -04:00
Matthew Bauer
bbdc1d118b
Merge pull request #97343 from cmacrae/emacs_mac/json_support
emacs-mac: json support
2020-09-08 12:36:39 -05:00
cmacrae
300df2e2f5 emacs-mac: json support 2020-09-08 09:56:12 +01:00
Frederik Rietdijk
af81d39b87 Merge staging-next into staging 2020-09-04 20:03:30 +02:00
Damien Cassou
556b29dd3e
emacs: Add missing patches to the Emacs derivations
patches were removed by a recent refactoring of Emacs packages:

  967259e6b4 * emacs: Factor out expression to a generic build
2020-09-03 17:10:32 +02:00
Andreas Fuchs
04fffd6cae emacs: use -B flags for native compilation dependencies
The -B flag to gcc (and libgccjit) allows us to specify where it can
find things it needs to correctly compile code (both programs and
libraries) without adjusting any environmental flags: So, no need to
wrap the program for a PATH entry containing binutils, and no need to
explicitly pass a linker path anymore.
2020-09-01 22:58:27 -04:00
Andreas Fuchs
6ad323d0a0 emacs: use -B flags for native compilation dependencies
The -B flag to gcc (and libgccjit) allows us to specify where it can
find things it needs to correctly compile code (both programs and
libraries) without adjusting any environmental flags: So, no need to
wrap the program for a PATH entry containing binutils, and no need to
explicitly pass a linker path anymore.
2020-08-31 00:47:33 -04:00
Andreas Fuchs
3384837123 emacs: Use stdenv's bintools instead of clang
This way, we don't have to drag clang or binutils/binutils-wrapped
into the emacs closure, and can instead rely on using the correct one
for the platform we're running on.

Co-authored-by: Matthew Bauer <mjbauer95@gmail.com>
2020-08-30 10:58:50 -04:00
Andreas Fuchs
ad7a3fb3f6 emacs: Use stdenv.cc.libc instead of plain .libc
This is the portable way to address the system-appropriate libc,
better than conditionalizing by (darwin/GNU) system or using either
one.
2020-08-29 23:10:38 -04:00
Andreas Fuchs
a891ae41b3 emacs: Set native-comp library path as linker flags instead
Since Darwin's linker does not understand LIBRARY_PATH, we have to set
the library path as explicit linker flags: This requires a very recent
feature/native-comp emacs revision, but it runs on Darwin and
correctly compiles files at runtime.
2020-08-29 23:10:38 -04:00
Andreas Fuchs
861f27018d emacs: Fix paths to bintools on Darwin
This changes PATH such that the correct linker can be found to
construct .eln files at runtime.
2020-08-29 23:10:38 -04:00
Andreas Fuchs
0d15ea9500 emacs: Use stdenv.libc instead of .glibc
The latter doesn't exist on Darwin (and, presumably, other targets as
well). This change allows emacsGcc from emacs-overlay to attempt to
build where previously, the derivation would error out.
2020-08-25 08:12:35 -04:00
adisbladis
edd6216a00
emacs26: Add back at version 26.3 2020-08-21 00:58:17 +02:00
adisbladis
967259e6b4
emacs: Factor out expression to a generic build 2020-08-21 00:54:00 +02:00
adisbladis
13276abce9
emacs25: Drop outdated version 2020-08-21 00:32:37 +02:00
adisbladis
d95c93c2ae
emacs: Add --with-cairo when X is enabled 2020-08-17 11:31:42 +02:00
Peter Hoeg
5230f07301 emacs: use autoreconfHook instead of manually invoking it 2020-08-16 23:28:05 +08:00
Matthew Bauer
669f0d3f36 emacs-macport: 26.3-7.7 -> 27.1-8.0 2020-08-11 11:51:24 -05:00
adisbladis
7defacb757
emacs: 26.3 -> 27.1 2020-08-11 13:41:44 +02:00
adisbladis
5f74b92a14
emacs: Make stdenv.mkDerivation params non recursive 2020-07-24 12:11:05 +02:00
adisbladis
d1b0eef9b5
emacs: Don't use interpolation for version 2020-07-24 12:10:54 +02:00
adisbladis
807e8e053c
emacs: Always add cairo as a build input if X is enabled 2020-07-24 03:16:17 +02:00
adisbladis
bf9e3b8dbf
emacs: Add native-comp feature branch infrastructure 2020-07-23 20:34:40 +02:00
adisbladis
24fd45ad8b
emacs: Add jansson & harbuzz inputs
These are required for emacs 27 and above and the nix-community emacs
overlay are adding these via overrides.

Add these already on emacs 26 to be forwards compatible and require
less overrides in the overlay.
2020-07-23 20:34:39 +02:00
adisbladis
2b520b08d9
emacs: Move toolkit to function arguments
It's possible to build Emacs without any toolkits which uses xlib.
2020-05-23 22:34:26 +01:00
Jörg Thalheim
887295fd2d
treewide: remove the-kenny from maintainers
@the-kenny did a good job in the past and is set as maintainer in many package,
however since 2017-2018 he stopped contributing. To create less confusion
in pull requests when people try to request his feedback, I removed him as
maintainer from all packages.
2020-05-09 10:28:57 +01:00
Pavol Rusnak
6abf4a43ad
treewide: per RFC45, remove more unquoted URLs 2020-05-08 15:20:47 +02:00
John Wiegley
fd494fc013
Merge pull request #84785 from mikesperber/unbreak-emacs-macos 2020-04-20 10:57:17 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Mike Sperber
076f221a0b emacs: Unbreak on macOS
Backport an unexec fix.
2020-04-09 10:17:38 +02:00
Suwon Park
0d09b7025b
accidently added semicolon
Oops
2020-03-18 23:20:28 +09:00
Suwon Park
a99565139f
glib-networking for TLS/SSL network (https://) in xwidget
ea5bcb78c2 (r31513119)
He accidently errased the glib-networking.
But it is needed for TLS/SSL networking.
2020-03-18 23:03:17 +09:00
adisbladis
cf719bf9a8
emacs: Add adisbladis as maintainer 2020-03-15 01:03:40 +00:00
Robin Gloster
755db0b689
treewide: installTargets is a list 2019-12-31 00:25:26 +01:00
Robin Gloster
0f67406076
treewide: installTargets is a list 2019-12-30 04:50:37 +01:00
Jason Samsa
77804abdd4 emacsMacport: add version attribute
Changes in https://github.com/NixOS/nixpkgs/pull/74936 depend on emacs
derivations to have a version attribute.
2019-12-13 14:50:49 -06:00
worldofpeace
eda1ea51cd emacs25: support webkitgtk 2019-12-05 16:39:44 -05:00
Mario Rodas
bc8ef6c3ff
emacs: also allow librsvg dependency when using withNS 2019-11-05 21:00:00 -05:00
Matthew Bauer
abd1172a6f emacs: 26.2 -> 26.3; emacs-mac: 26.2-7.6 -> 26.3-7.7 2019-08-29 10:19:55 -04:00
Matthew Bauer
2255f29206
Merge pull request #64901 from dgchurchill/emacs-imagemagick-macos
emacs: Also allow imagemagick dependency when using withNS
2019-07-17 10:07:01 -04:00
Dave Churchill
9339970dbf emacs: Also allow imagemagick dependency when using withNS
This allows Emacs to be used with imagemagick on macOS.
2019-07-16 22:09:43 +10:00
Frederik Rietdijk
79a03641d5 Merge staging-next into staging 2019-07-09 15:46:26 +02:00
Alex Branham
b86c2c54e5
emacs: Silence compiler warnings in site-start.el 2019-07-07 08:35:10 -05:00
Daiderd Jordan
f2d2381838
emacs: remove cf-private 2019-07-03 22:20:19 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Frederik Rietdijk
f137783927 Merge master into staging-next 2019-05-01 11:45:46 +02:00
Peter Hoeg
496f930948 emacs: do not capture build environment details for a (more) reproducible build 2019-04-29 14:38:04 +08:00
Matthew Bauer
ba957d538d emacs-mac: remove MAC_OS_X_VERSION_MAX_ALLOWED
No longer needed
2019-04-26 21:54:58 -04:00