Commit Graph

43 Commits

Author SHA1 Message Date
Vladimír Čunát
cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +02:00
William A. Kennington III
5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Jude Taylor
71d98332e9 make emacs buildable 2015-09-21 12:17:29 -07:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Shea Levy
3506c0bf04 emacs: Build cocoa on darwin 2015-08-20 08:37:04 -04:00
Vladimír Čunát
8f2be7122c emacs24: style fixups
Unused gtk parameter, "incorrect" usage of optional.
2015-08-11 17:26:51 +02:00
Eelco Dolstra
761fc1a457 Remove tabs 2015-07-26 12:00:43 +02:00
Asko Soukka
278287a99b emacs: fix to use \${gettext}/share/locale/locale.alias 2015-07-03 03:18:15 +03:00
Herwig Hochleitner
8b0b9be025 emacs24: add options for acl and gpm 2015-06-07 13:26:27 +02:00
Aycan iRiCAN
151456da27 emacs-24: Removed obsolete patch file 2015-04-20 08:28:17 +03:00
Luca Bruno
9d3f02c5de Revert "Emacs 24.5: Fix build on Darwin."
This reverts commit 869b86d925.

It breaks tarball evaluation, see 869b86d925
2015-04-17 13:01:09 +02:00
Moritz Ulrich
869b86d925 Emacs 24.5: Fix build on Darwin.
`darwin-new-sections.patch' is now in upstream.
2015-04-15 12:02:38 +02:00
Thomas Tuegel
e75a0c50bd emacs: allow gtk without X on Darwin 2015-04-14 09:16:21 -05:00
Thomas Tuegel
cebf589462 Merge pull request #7294 from ttuegel/emacs
emacs: allow choosing gtk2 or gtk3
2015-04-12 15:12:12 -05:00
Moritz Ulrich
034e1c4aef emacs24: Update to 24.5 2015-04-11 14:24:41 +02:00
Thomas Tuegel
bc4f39f48b emacs: allow choosing gtk2 or gtk3 2015-04-09 11:38:46 -05:00
=
46d1dd5b11 Downgraded Emacs priority, for exuberant ctags
Exuberant ctags works with Emacs among with other editors, and if
installed is probably preferred to Emacs' ctags.
2015-03-26 21:42:36 +00:00
Moritz Ulrich
86bd152378 Emacs: Fix `woman'. 2015-03-07 12:03:26 +01:00
John Wiegley
0d1a16d48f emacs24: Add #define for building on Yosemite (darwin) 2015-01-03 07:32:38 -05:00
Moritz Ulrich
635d49e973 Emacs: remove --with-crt-dir (no longer supported) 2014-10-25 20:34:51 +02:00
Moritz Ulrich
7e78166563 emacs24: Update to 24.4. 2014-10-20 22:08:19 +02:00
Moritz Ulrich
10ba4b67e4 Emacs: Use gnutls instead of OpenSSL.
It looks like this error was introduced accidentally with 0132e1b. Emacs
can't use openssl to make secure connections.
2014-08-21 12:45:28 +02:00
Eelco Dolstra
0132e1bb48 emacs: On Darwin, don't depend on gconf and cairo 2014-08-09 19:08:37 +02:00
Eelco Dolstra
a7c1541a21 emacs: Fix building on Darwin with recent versions of GCC
This gets rid of the "unexec: unrecognized section __static_data in
__DATA segment" error while dumping Emacs.
2014-08-09 19:08:37 +02:00
Petr Rockai
e3fae16a29 emacs: Allow non-GTK X11 builds (--with-x-toolkit=lucid). 2014-01-25 16:30:14 +01:00
Eric Kow
9a97b842c5 Emacs darwin: avoid X unless explictly requested
This keeps the dependencies lighter. Perhaps future work on this
derivation could enable the Cocoa interface by default on Mac.
2013-11-10 13:41:10 +00:00
Benno Fünfstück
351c9e310d Emacs: Fix TRAMP by adjusting its path so that it finds ls and other binaries on NixOS systems
Close #1094.
2013-10-22 09:56:43 +03:00
Vladimír Čunát
d3c6bd45ca emacs24: fix license typo, change indentation
Note that the double-quote "indented strings" strip indentation,
so this ugly style was pointless.
2013-09-14 15:30:27 +02:00
Jason \"Don\" O'Conal
ad454f3511 emacs24: fix build on darwin (clos #932) 2013-09-14 15:19:54 +02:00
Danie Roux
fcd9904be6 emacs24: Let -nox be a whole lot less X than it was
--with-x-toolkit=no still wants to -lX11 when checking for ncurses
2013-09-01 16:30:32 +02:00
Moritz Ulrich
a10812f792 Add emacs24-nox: emacs built without X (or GTK) libraries.
This commit also fixes an issue where pkgconfig was only added as a
dependency when gtk support was enabled. This made ./configure unable
to find other libraries (libtiff, libxml2, gnutls, and others).
2013-08-24 07:36:11 +03:00
Eelco Dolstra
7ac6b10446 emacs: Support building without GTK+ 2013-08-21 11:47:57 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Jason "Don" O'Conal
72a771b6e4 emacs24: fix build on darwin 2013-07-03 19:57:38 +10:00
Peter Simons
5186e75c4f emacs: update to version 24.3
The builder.sh script used to call "make bootstrap" before running the build.
This build step, however, removes all kinds of generated files normally
included in the distributions -- such as the 'configure' script. If that target
is run, then new version of Emacs require Autoconf and Automake to compile.
Since the benefit of running "make bootstrap" is unclean to me, I chose to
remove that build step instead. As far as I can tell, the Emacs binary that
results from this build works fine.
2013-03-11 19:18:31 +01:00
Ludovic Courtès
dc4cfe89ff emacs: Update to 24.2. 2012-08-27 18:16:06 +02:00
Peter Simons
6ace4728f5 emacs-24: improved meta.description
svn path=/nixpkgs/trunk/; revision=34477
2012-06-12 12:18:12 +00:00
Peter Simons
b4ebc3bb42 emacs: version emacs-24.1 is out
The 24.x version is still low-prio in nixpkgs until we've figured out how to
support multiple 'emacsPackages' sets properly.

svn path=/nixpkgs/trunk/; revision=34447
2012-06-11 07:44:12 +00:00
Florian Friesdorf
7b47dea7b0 emacs-24.0.94 (pretest)
svn path=/nixpkgs/trunk/; revision=32997
2012-03-11 20:45:49 +00:00
Florian Friesdorf
2f7102afc0 emacs 24.0.93
svn path=/nixpkgs/trunk/; revision=32123
2012-02-07 17:40:05 +00:00
Florian Friesdorf
5c05e3f866 emacs-24 alsaLib and imagemagickBig
svn path=/nixpkgs/trunk/; revision=31788
2012-01-23 00:55:48 +00:00
Florian Friesdorf
0d2d1dd139 emacs-24.0.92
svn path=/nixpkgs/trunk/; revision=31763
2012-01-21 18:28:57 +00:00
Florian Friesdorf
aa277f7d06 emacs-23 as base for emacs-24
svn path=/nixpkgs/trunk/; revision=31762
2012-01-21 18:28:54 +00:00