3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

351 commits

Author SHA1 Message Date
adisbladis c54c8f8dfa
emacs26: Drop unsupported package 2021-03-02 16:17:37 +02:00
adisbladis c801ffd4a3
emacs: Use --with-native-compilation instead of --with-nativecomp
Upstream changed this parameter name in https://git.savannah.gnu.org/cgit/emacs.git/commit/?h=feature/native-comp&id=42fc752a14b23be95f02b598930f13a96883d3a0
2021-02-26 23:31:27 +02:00
adisbladis 44131d7fc3
emacs: Remove clean-env patch and use substituteInPlace
This approach applies to _all_ RUN_TEMACS calls and successfully removes -dev paths from the closure and reduces the closure size from ~1.4G to just under ~464M.

It's also less brittle than having in-tree patches.
2021-02-25 12:40:37 +02:00
Mauricio Collares 4d60e14ad2 emacs: precompile trampolines in parallel 2021-02-19 19:35:07 -03:00
Mauricio Collares 2ff98c2f17
emacs: precompile all trampolines 2021-02-19 11:41:29 +01:00
Alyssa Ross 7eaa07dd3f
emacs: add withMotif option
Why not? ;)
2021-02-12 12:59:52 +00:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
adisbladis 6347f78fd9
emacsPackages*: Move to emacs*.pkgs
This makes it much easier to create customisations around emacs via
the a new convenience passthru attr:
- `emacs.pkgs`: What used to be emacsPackages is now `emacs.pkgs`

The previous versioned names `emacs*Packages` have been moved to
aliases.nix and are now considered deprecated in favour of `emacs*.pkgs`.
2021-01-13 17:04:55 +01:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Tad Fisher a7cb8e36ac
emacs: Add comp-eln-load-path infrastructure 2020-12-16 19:45:07 +01:00
adisbladis a9fe36cd0b
Merge pull request #106547 from alyssais/siteVersionDir
emacs: fix siteVersionDir path
2020-12-11 00:19:21 +01:00
adisbladis 09e349206d
Merge pull request #106486 from alyssais/emacsWithPackages
emacsWithPackages: EMACSLOADPATH correctness fixes
2020-12-11 00:08:59 +01:00
Alyssa Ross 23d4bfb666
emacsWithPackages: don't tell sub-Emacs about pkgs
If I'm running an Emacs executable from emacsWithPackages as my main
programming environment, and I'm hacking on Emacs, or the Emacs
packaging in Nixpkgs, or whatever, I don't want the Emacs packages
from the wrapper to show up in the load path of that child Emacs.  It
results in differing behaviour depending on whether the child Emacs is
run from Emacs or from, for example, an external terminal emulator,
which is very surprising.

To avoid this, pass another environment variable containing the
wrapper site-lisp path, and use that value to remove the corresponding
entry in EMACSLOADPATH, so it won't be propagated to child Emacsen.
2020-12-10 22:52:31 +00:00
Alyssa Ross 755670f5e4
emacs: fix siteVersionDir path
siteVersionDir isn't a full path, it's just the name of the version
directory entry in $out/share/emacs, e.g. "27.1", so since
d1b0eef9b5 ("emacs: Don't use interpolation for version"), we've been
trying to remove a non-existent directory.  This would have been
caught if we hadn't been giving -f to rm unnecessarily, because -f
suppresses errors.  As well as fixing the path, I've removed the -f
from rm.  Doing this to the line above as well revealed that rm-ing
$out/var was no longer necessary, since nothing has been put there
since ac23a7c459 ("emacs: 25.3 → 26.1") -- it would now only be
created if we set the --with-gameuser configure option, which we
don't.
2020-12-10 12:19:14 +00:00
Matt Jones 571b17de5e
emacs: Link native-lisp directory into Mac app (#103933)
Without the symlink, the application can't be launched.

Fixes <https://github.com/nix-community/emacs-overlay/issues/71>

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-12-03 11:41:46 -05:00
Michael Raskin eee54dba79
Merge pull request #103913 from catern/copysrc
emacs: properly include source code when withCsrc is true
2020-11-22 16:37:40 +00:00
Spencer Baugh 802fa5b9d1 emacs: properly calculate the path of the src directory 2020-11-15 13:32:05 -05:00
Spencer Baugh e4fcc9aed1 emacs: properly include source code when withCsrc is true
Previously, we just copied it into a separate directory in the build
directory. That's not useful, and not what was intended.
2020-11-15 10:59:19 -05:00
Mario Rodas ed047f80bf emacs: make ImageMagick dependency optional in Emacs≥27
Emacs 27 doesn't use ImageMagick by default to display images [1]:

    ** Emacs no longer defaults to using ImageMagick to display images.
    This is due to security and stability concerns with ImageMagick.  To
    override the default, use 'configure --with-imagemagick'.

[1] https://github.com/emacs-mirror/emacs/blob/emacs-27.1/etc/NEWS#L96-L98
2020-10-31 04:20:00 +00:00
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
Matthew Bauer f7776ce336 emacs-mac: 26.1 -> 26.2 2019-04-16 15:15:03 -04:00
adisbladis abedaef818
emacs: 26.1 -> 26.2 2019-04-13 00:00:03 +01:00
Vladyslav M 60ec578e6a
Merge pull request #57237 from vlaci/pkgs/emacs
emacs: backport hunspell 1.7.0 support from upstream
2019-03-29 16:32:07 +02:00
Andrew Childs 26e82e684c emacs: only use patchelf on linux
This prevents building Emacs with X on Darwin.

Broken by 5af6e9f75e (#54916)
2019-03-28 16:03:46 +09:00
László Vaskó 4952378a87 emacs: backport hunspell 1.7.0 support from upstream
NixOS 19.03 has hunspell 1.7.0 which is incompatible with emacs 26.1.
This issue has been fixed in upstream and we should drop this patch
after emacs is updated too.
2019-03-10 15:39:29 +01:00
deliciouslytyped e5442ee185 emacs26: adds parameter siteStart: don't hard-code ./site-start.el 2019-03-03 20:25:00 +01:00
Florian Friesdorf fbef5ab82f Remove myself as maintainer from packages
I'm currently not maintaining any packages.
2019-02-22 16:14:13 +01:00
Matthew Bauer d6d5795ed9
Merge pull request #54916 from pbogdan/emacs-xcursor
emacs: link libXcursor when using lucid toolkit
2019-02-19 22:50:30 -05:00
Daiderd Jordan b8a3084eaa
emacsMacport: fix sandbox build 2019-02-13 19:49:17 +01:00
Piotr Bogdan 5af6e9f75e emacs: link libXcursor when using lucid toolkit 2019-01-30 16:21:06 +00:00
Olli Helenius 2f9b85855b emacs: tramp: detect wrapped gvfsd-fuse daemon
Tramp checks for a running `gvfsd-fuse` process to figure out whether to enable
gvfs-based. Its `tramp-compat-process-running-p` function uses
`/proc/<pid>/comm` to check for the name of running process(es). In Nix, the
gvfsd processes are launched via wrappers and the name of `gvfsd-fuse` in
`comm` in Linux is `.gvfsd-fuse-wra` (truncated to 15 characters) which
means the process is not detected and `tramp-gvfs-enabled` ends up with
`nil` even when gvfs is available.

This patch adds `.gvfsd-fuse-wrapped` to the list of process names to check when
determining the value of `tramp-gvfs-enabled`.
2019-01-10 18:16:03 +02:00
Matthew Bauer 7a2f45fe1a emacs-mac: 7.2 → 7.4 2018-12-25 15:24:03 -06:00
Alex Branham c08ec87fe3
Emacs site-start: Use correct feature name
* pkgs/applications/editors/emacs/site-start.el (tramp-sh): Use
  correct feature name

Tramp upstream recently dropped the autoload cookie from
tramp-remote-path. This makes Emacs error when trying to load tramp.
Using the correct feature name fixes this.
2018-12-17 12:36:40 -06:00
c0bw3b 0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
Daiderd Jordan c60816c523
emacsMacport: add cf-private
Also remove incorrect emacs25Macport alias.

    Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _mac_term_init in macterm.o
          _macfont_copy_available_families_cache in macfont.o
      "_CFNotificationCenterGetDistributedCenter", referenced from:
          _mac_term_init in macterm.o
      "_CFNotificationCenterGetLocalCenter", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_CFURLCopyResourcePropertyForKey", referenced from:
          _Fmac_file_alias_p in mac.o
      "_CFURLCreateBookmarkDataFromFile", referenced from:
          _Fmac_file_alias_p in mac.o
      "_CFURLCreateByResolvingBookmarkData", referenced from:
          _Fmac_file_alias_p in mac.o
      "_CFURLResourceIsReachable", referenced from:
          _mac_update_title_bar in macfns.o
          _mac_input_source_properties in macfns.o
      "_NSDefaultRunLoopMode", referenced from:
          -[NSApplication(Emacs) runTemporarilyWithBlock:] in macappkit.o
          ___57-[EmacsController handleQueuedNSEventsWithHoldingQuitIn:]_block_invoke in macappkit.o
          _mac_run_loop_run_once in macappkit.o
          ___mac_run_loop_run_once_block_invoke in macappkit.o
          ___37-[EmacsController(Menu) trackMenuBar]_block_invoke in macappkit.o
          ___create_and_show_dialog_block_invoke.2445 in macappkit.o
          ___mac_select_block_invoke in macappkit.o
          ...
      "_NSURLAttributeModificationDateKey", referenced from:
          _mac_document_create_with_url in macappkit.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSData", referenced from:
          l_OBJC_$_CATEGORY_NSData_$_Emacs in macappkit.o
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMethodSignature", referenced from:
          l_OBJC_$_CATEGORY_NSMethodSignature_$_Emacs in macappkit.o
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          l_OBJC_$_CATEGORY_NSMutableArray_$_Emacs in macappkit.o
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableData", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableSet", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSNull", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSSet", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table81 in macappkit.o
          GCC_except_table810 in macappkit.o
      "_kCFURLIsAliasFileKey", referenced from:
          _Fmac_file_alias_p in mac.o
      "_kCFURLIsSymbolicLinkKey", referenced from:
          _Fmac_file_alias_p in mac.o
    ld: symbol(s) not found for architecture x86_64
2018-11-07 23:47:19 +01:00
Daiderd Jordan b378760b08
emacs25: add cf-private on darwin and don't propagate frameworks
Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_CFNotificationCenterGetLocalCenter", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_NSDefaultRunLoopMode", referenced from:
          _ns_send_appdefined in nsterm.o
          -[EmacsApp run] in nsterm.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in nsimage.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in macfont.o
      "_OBJC_CLASS_$_NSLocale", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSMutableSet", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table8 in nsterm.o
          GCC_except_table1 in nsselect.o
    ld: symbol(s) not found for architecture x86_64
2018-11-07 19:18:17 +01:00
Daiderd Jordan f495707eb6 emacs: include cf-private on darwin and don't propagate frameworks
Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_CFNotificationCenterGetLocalCenter", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_NSDefaultRunLoopMode", referenced from:
          _ns_send_appdefined in nsterm.o
          -[EmacsApp run] in nsterm.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in nsimage.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in macfont.o
      "_OBJC_CLASS_$_NSLocale", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSMutableSet", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table8 in nsterm.o
          GCC_except_table1 in nsselect.o
    ld: symbol(s) not found for architecture x86_64
2018-11-05 21:16:58 +01:00
Matthew Bauer 962756e818 emacs-mac: use generic builder
this builder leads to confusion, especially since it is no longer used
in the normal emacs derivation.
2018-10-14 22:41:42 -05:00
Matthew Bauer 2240445067 emacsMacport: 7.1 → 7.2
Fixes a critical issue with macOS

[NEWS](https://bitbucket.org/mituharu/emacs-mac/raw/master/NEWS-mac)

* emacs-26.1-mac-7.2 (2018-09-09)

** Fixed bugs

*** Buffer contents are not displayed on macOS 10.14.
This is mainly because now NSViews are backed by Core Animation Layer
(layer-backed) by default and non-deferred drawing into views no
longer works.  Instead of switching to deferred drawing (i.e., draw
only inside -[NSView drawRect:]), we draw into our own backing bitmap
in a non-deferred way as before, and update the view contents with the
resulting image via -[NSView updateLayer].  This "application-side
double buffering" is also available on OS X 10.8 - macOS 10.13 if you
set the frame parameter `inhibit-double-buffering' to nil when
creating a frame.  Just like on macOS 10.14, such a frame does not do
LCD smoothing.

*** Screenshot grabbed via Services is displayed in wrong size when we
have display mirroring between Retina and non-Retina displays.

*** Cursor movement just after frame resize sometimes leaves garbage.

*** Crash by the Fall_threads call from the GUI thread at the select
emulation when there are multiple Lisp threads.

*** Info title has ASCII underline unlike other window systems.

*** Vertical scroll bar is created as horizontal if frame font height
is short.

** Improvements

*** macOS 10.14 adds property :appearance to (mac-application-state).
The value may be "NSAppearanceNameAqua" or "NSAppearanceNameDarkAqua".

*** Add new color format "mac:COLOR-LIST-NAME:COLOR-NAME" and
"mac:COLOR-NAME" (shorthand for "mac:System:COLOR-NAME").  The actual
color may be different depending on the global appearance setting on
macOS 10.14.  For example, "mac:textColor" is black on the Light Mode
but is white on the Dark Mode.

*** Default frame colors respect appearance setting on macOS 10.14.
Now the default frame foreground/background color is
"mac:textColor"/"mac:textBackgroundColor", respectively.  Changes of
the system setting of the global appearance are dynamically reflected.

*** New function `mac-color-list-alist' to get the available
combinations of COLOR-LIST-NAMEs and COLOR-NAMEs.  Note that this
value is dependent on user environment and OS version.  Also, some
combinations may represent image patterns rather than colors.  For the
former cases, `(color-values "mac:COLOR-LIST-NAME:COLOR-NAME")'
returns nil.
2018-09-24 21:39:11 -05:00
Andrew Childs bbf37b8c45 emacs: allow X and cli-only builds on Darwin 2018-09-10 12:20:23 +09:00
Herwig Hochleitner ea5bcb78c2 emacs: update dependencies
new config options, xwidgets support updated in emacs 26

cc @chaoflow @lovek323 @peti @the-kenny @jwiegley
2018-08-16 09:38:55 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Justin Bauer ec3957591f
emacs-mac: fix meta
- add myself as a maintainer
- fix name and description for emacs 26
2018-06-20 16:28:25 -04:00
John Wiegley 4821a07370
emacsMacport: 26.1-7.0 -> 26.1-7.1 2018-06-14 15:35:05 -07:00
Matthew Bauer bc490a4b3f emacs-mac: don’t propagate frameworks
This makes the closure really big & is not needed for a running emacs.
2018-06-09 12:58:58 -04:00
Matthew Bauer 697ae2a073 emacsMacport: apply clean-env.patch 2018-06-09 12:33:18 -04:00
Matthew Bauer ee1d6114a8 emacsMacport: 25.3 -> 26.1 2018-05-31 12:34:16 -04:00
Matthew Bauer aa2160e1b6 emacs26: add some tweaks from jwiegley’s overlay
original src:
f85c560bf8/overlays/10-emacs.nix
2018-05-28 13:35:10 -04:00
Matthew Bauer a87b50bc63 emacs: readd version 25 2018-05-28 13:35:05 -04:00
Matthew Bauer ac23a7c459 emacs: 25.3 → 26.1 2018-05-28 11:35:20 -04:00
Jan Tojnar a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Moritz Ulrich 7cfdb2b1b5
emacs: Search subdirectories of site-lisp in NIX_PROFILES
This adds subdirectories of `share/emacs/site-lisp/` in every path in
`NIX_PROFILES` to `load-path` to allow loading of more complex
libraries like `mu4e`.

Fixes #33412
2018-01-05 10:50:18 +01:00
Moritz Ulrich 1543c8cc01
emacs: Add more documentation to site-start.el
`site-start.el` is the file loaded on startup, containing nix-specific
customizations like adding paths in `NIX_PROFILES` to the
emacs-specific search-path (`load-path`) or making man-pages in these
directories discoverable.
2018-01-05 10:50:13 +01:00
Moritz Drexl 3d52d43dd9 emacs: enable vfork on darwin
Issue described here:
https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html

In particular fixes lagging magit, as described here:
https://magit.vc/manual/magit/MacOS-Performance.html

The .patch file is taken from the reference there.

The fix is in Emacs master, so this patch should be removed when switching to
Emacs 26.1.
2017-12-16 22:25:42 +00:00
Anthony Cowley a4203d0ffc emacsMacport: 25.3-6.7 -> 25.3-6.8 2017-10-16 15:16:01 -04:00
Eelco Dolstra cf599d3f99
emacs: Clear the environment while dumping
This reduces the closure size of Emacs from 575 to 279 MiB. Dumping
Emacs had a chance of leaking parts of the environment (such as $PATH)
into the dumped executable. This hopefully fixes it. (It's a bit hard
to tell since the effect is not deterministic.)
2017-09-25 19:38:44 +02:00
Anthony Cowley 50a33089c6 emacsMacport: emacs-25.2 => 25.3, macport-6.3 => 6.7 2017-09-14 16:22:19 -04:00
Mikael Brockman 78f457c76c emacs: 25.2 -> 25.3
https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00211.html

> This is an emergency release to fix a security vulnerability in Emacs.
>
> Enriched Text mode has its support for decoding 'x-display' disabled.
> This feature allows saving 'display' properties as part of text.
> Emacs 'display' properties support evaluation of arbitrary Lisp forms
> as part of instantiating the property, so decoding 'x-display' is
> vulnerable to executing arbitrary malicious Lisp code included in the
> text (e.g., sent as part of an email message).
2017-09-12 09:45:02 +03:00
Volth b7ccf27229 rename webkitgtk24x -> webkitgtk24x-gtk3; webkitgtk2 -> webkitgtk24x-gtk2 2017-05-26 13:43:25 +00:00
Yann Hodique 7e273df818 emacs-macport: align buildInputs and configureFlags on emacs 2017-04-22 11:44:03 -07:00
Yann Hodique d884024d42 emacs: 25.1 -> 25.2 2017-04-22 11:44:03 -07:00
Leon Isenberg f20a10b451 emacsMacport: change naming scheme
Changed name from emacs-25.1-mac-6.1 to emacs-mac-25.1-6.1.
The former scheme confused compareVersions from nix and consequently
nix-env -u.
2017-03-27 10:34:41 +02:00
Leon Isenberg acb3135613 emacsMacport: correct description 2017-03-24 22:58:32 +01:00
Drew Hess b800655639
emacs25Macport: fix for new macOS 10.10 frameworks.
See https://github.com/NixOS/nixpkgs/pull/23907#issuecomment-286627100.
2017-03-19 18:11:21 +01:00
Daiderd Jordan a48df6fba6 Merge pull request #22508 from matthewbauer/remove-emacs24macport
emacs24macport: remove
2017-03-18 22:19:20 +01:00
Nikolay Amiantov a8785daf0e emacs: fix runtime GTK3 dependencies
Fixes #23845.
2017-03-18 01:32:42 +03:00
Aycan iRiCAN 2ce7dd7fbb emacs: fix sha256 hashes of savannah patches 2017-02-15 18:33:01 +03:00
Thomas Tuegel 8bddf6d6ab Merge pull request #22514 from peterhoeg/f/emacs
emacs: make gtk3 default
2017-02-10 11:48:50 -06:00
Matthew Bauer 3a9a707fd4
emacs24macport: remove 2017-02-06 16:46:05 -06:00
Peter Hoeg bc6b917100 emacs: make gtk3 default 2017-02-06 14:32:36 +08:00
Matthew Bauer 516300624e
emacs25Macport: use newer icons 2017-01-23 17:49:39 -06:00
Daiderd Jordan 3bd81a0620 Merge pull request #20536 from TikhonJelvis/master
emacs-24.5-mac-5.15: fixed package by adding build tools
2016-12-13 23:28:37 +01:00
Matthew Bauer 558551399d
emacs-macport: 6.0 -> 6.1 2016-11-25 00:29:55 -06:00
Matthew Bauer 25cfafdf5b
emacs-macport: fix "Carbon.h" present but cannot be compiled
Previously, emacs-macport was giving the error:

- AppKit/AppKit.h: present but cannot be compiled
- Carbon/Carbon.h: present but cannot be compiled

This add "MAC_OS_X_VERSION_MIN_REQUIRED=1090" to CFLAGS to allow them
to compile with the new 10.10 headers.

Fixes #20682.
2016-11-25 00:25:05 -06:00
Tikhon Jelvis f4c96de8f9 Fixed the emacs24 macport package by adding automake and autoconf build tools. 2016-11-18 11:05:52 -08:00
John Wiegley c4d2d56f22
emacs: Missed a pluralization... 2016-11-16 08:54:30 -08:00
John Wiegley 0bf515c973
emacs: Depend on libselinux only for Linux 2016-11-16 08:53:45 -08:00
Herwig Hochleitner d1dba6e083 emacs: add selinux capability 2016-11-10 15:59:52 +01:00
Herwig Hochleitner db402312a3 emacs: fix segfaults in 25.1 2016-11-10 15:59:47 +01:00
Nicolas Dudebout 7e7d588ca9 emacs: install the C source from postInstall
Reimplement the C source installation from the derivation instead of
relying on a Makefile patch.
2016-09-27 15:57:52 -04:00
Nicolas Dudebout bb6708b858 emacs: add an option to install the C source
Install the source files, and the associated TAGS files. Use
.dir-locals.el to select the TAGS file automatically.

Turn the option on by default, to get a consistent behavior when using
xref-find-definitions (M-.), whether looking for an elisp (e.g. defun)
or a C (e.g. defalias) definition.
2016-09-26 17:09:06 -04:00
Periklis Tsirakidis 937b56f5db emacs-25-macport: init at 25.1-mac-6.0 (#18363) 2016-09-21 22:19:57 +02:00
Nicolas Dudebout fafff78d3d Emacs cleanup (#18730)
emacs: Clean up derivation
2016-09-20 10:13:01 +02:00
Moritz Ulrich 01e44ac1f9 emacs: 24.5 -> 25.1
This commit removes all references to emacs24 with the exception of
emacs24-macports. The two folders in `pkgs/applications/editors` named
`emacs-24` and `emacs-24` are consolidated to a new `emacs` folder.

Various parts in nixpkgs also referenced `emacs24Packages` (pinned to
`emacs24`) explicitly where `emacsPackages` (non-pinned) is more
appropriate. These references get fixed by this commit too.
2016-09-18 13:38:21 +02:00
Eelco Dolstra 16c6da0129 * Emacs 22.1. This is the default now, but 21.4 is still around
(as is the 23.0.0.1 alpha).

svn path=/nixpkgs/trunk/; revision=9175
2007-08-20 13:48:56 +00:00
Eelco Dolstra 6c92badd87 * Added the Emacs Unicode branch (which supposedly will become Emacs
23.x), which GTK and Xft support.  Add something like

    (set-default-font "Bitstream Vera Sans Mono-8")

  to ~/.emacs to get a TTF font.

svn path=/nixpkgs/trunk/; revision=7841
2007-02-05 14:55:15 +00:00
Eelco Dolstra 42558043b3 * Emacs: use ncurses so that we don't need /etc/termcap in terminal
mode.

svn path=/nixpkgs/trunk/; revision=7287
2006-12-09 00:48:15 +00:00
Eelco Dolstra b90781ec21 * Renamed orig-glibc -> orig-libc in some places, and in others, use
the new $NIX_GCC/nix-support/dynamic-linker file to locate the
  dynamic linker directly (don't hardcode ld-linux.so.2).

svn path=/nixpkgs/trunk/; revision=6873
2006-10-27 12:43:32 +00:00
Eelco Dolstra 6006d61835 * Added a bunch of descriptions.
svn path=/nixpkgs/trunk/; revision=6705
2006-10-11 16:45:55 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra 05f665116a * Xaw3d: export Xaw header directory and propagate libXmu.
* Emacs: don't depend on libXaw when we're using Xaw3d.
* Enable X11R7.0 over the old XLibs.  Cross fingers :-)

svn path=/nixpkgs/trunk/; revision=4531
2006-01-09 19:37:11 +00:00
Eelco Dolstra 82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra b012d59f00 * Doh!
svn path=/nixpkgs/trunk/; revision=4290
2005-11-17 12:01:19 +00:00
Eelco Dolstra ea95a0509e * Start the switch to the new X libraries. It's still conditional:
set `useOldXLibs' to `false' in all-packages-generic.nix to use
  them.
* Added Xaw3d.
* Added Xaw3d support to Emacs.

svn path=/nixpkgs/trunk/; revision=4263
2005-11-12 17:05:51 +00:00
Eelco Dolstra 454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Martin Bravenboer 6863445f23 Haskell mode for emacs
svn path=/nixpkgs/trunk/; revision=1832
2004-12-06 07:36:56 +00:00
Martin Bravenboer 77d3911dbd Upgraded nxml mode and added cua mode
svn path=/nixpkgs/trunk/; revision=1544
2004-10-06 12:06:23 +00:00
Martin Bravenboer 8648397304 Finally, a real text editor in Nix. Todo: allow configuration with modes.
svn path=/nixpkgs/trunk/; revision=1543
2004-10-06 11:32:20 +00:00
Eelco Dolstra 27c2b77154 * NXML: latest and greatest.
svn path=/nixpkgs/trunk/; revision=1312
2004-08-22 21:26:47 +00:00
Eelco Dolstra 12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra a7055cbe52 * nxml package.
svn path=/nixpkgs/trunk/; revision=578
2003-12-08 11:56:50 +00:00