summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs/at-fdcwd.patch
diff options
context:
space:
mode:
authorMoritz Ulrich <moritz@tarn-vedra.de>2016-09-18 13:34:28 +0200
committerMoritz Ulrich <moritz@tarn-vedra.de>2016-09-18 13:38:21 +0200
commit01e44ac1f9af1d42ee9b5000426b780f2a03c948 (patch)
tree04b811bb05a6e2deb657805409c96b03e84c4d8c /pkgs/applications/editors/emacs/at-fdcwd.patch
parent20fb07dc4ae8a4dc186779f01f3a65e6cc6eed33 (diff)
downloadnixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar
nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.gz
nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.bz2
nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.lz
nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.xz
nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.zst
nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.zip
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.
Diffstat (limited to 'pkgs/applications/editors/emacs/at-fdcwd.patch')
-rw-r--r--pkgs/applications/editors/emacs/at-fdcwd.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch
new file mode 100644
index 00000000000..2d8099b7373
--- /dev/null
+++ b/pkgs/applications/editors/emacs/at-fdcwd.patch
@@ -0,0 +1,15 @@
+diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
+index 84ede3e..8e8f42e 100644
+--- a/lib/careadlinkat.h
++++ b/lib/careadlinkat.h
+@@ -23,6 +23,10 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ 
++#ifndef AT_FDCWD
++#define AT_FDCWD -2
++#endif
++
+ struct allocator;
+ 
+ /* Assuming the current directory is FD, get the symbolic link value