diff options
| author | Jun Hao <jun_hao@aol.com> | 2016-06-02 19:26:18 +0800 |
|---|---|---|
| committer | Jun Hao <jun_hao@aol.com> | 2016-06-03 09:52:31 +0800 |
| commit | b8b15ca2a3dfa5a807e09db52fb5cfa5c7dde1ad (patch) | |
| tree | 8833d46eac01c34ab20dbe20b2a601ad7ad380f2 /pkgs/applications | |
| parent | 7c19b395ebb8e41d814c64970c3b70ef6377a55b (diff) | |
| download | nixlib-b8b15ca2a3dfa5a807e09db52fb5cfa5c7dde1ad.tar nixlib-b8b15ca2a3dfa5a807e09db52fb5cfa5c7dde1ad.tar.gz nixlib-b8b15ca2a3dfa5a807e09db52fb5cfa5c7dde1ad.tar.bz2 nixlib-b8b15ca2a3dfa5a807e09db52fb5cfa5c7dde1ad.tar.lz nixlib-b8b15ca2a3dfa5a807e09db52fb5cfa5c7dde1ad.tar.xz nixlib-b8b15ca2a3dfa5a807e09db52fb5cfa5c7dde1ad.tar.zst nixlib-b8b15ca2a3dfa5a807e09db52fb5cfa5c7dde1ad.zip | |
emacs|emacs25pre: Check AT_FDCWD is not defined before define it
https://github.com/NixOS/nixpkgs/issues/11723
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/emacs-24/at-fdcwd.patch | 6 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-25/at-fdcwd.patch | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/editors/emacs-24/at-fdcwd.patch b/pkgs/applications/editors/emacs-24/at-fdcwd.patch index 1f99d4e18094..2d8099b73736 100644 --- a/pkgs/applications/editors/emacs-24/at-fdcwd.patch +++ b/pkgs/applications/editors/emacs-24/at-fdcwd.patch @@ -1,12 +1,14 @@ diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h -index 5cdb813..7a272e8 100644 +index 84ede3e..8e8f42e 100644 --- a/lib/careadlinkat.h +++ b/lib/careadlinkat.h -@@ -23,6 +23,8 @@ +@@ -23,6 +23,10 @@ #include <fcntl.h> #include <unistd.h> ++#ifndef AT_FDCWD +#define AT_FDCWD -2 ++#endif + struct allocator; diff --git a/pkgs/applications/editors/emacs-25/at-fdcwd.patch b/pkgs/applications/editors/emacs-25/at-fdcwd.patch index 1f99d4e18094..2d8099b73736 100644 --- a/pkgs/applications/editors/emacs-25/at-fdcwd.patch +++ b/pkgs/applications/editors/emacs-25/at-fdcwd.patch @@ -1,12 +1,14 @@ diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h -index 5cdb813..7a272e8 100644 +index 84ede3e..8e8f42e 100644 --- a/lib/careadlinkat.h +++ b/lib/careadlinkat.h -@@ -23,6 +23,8 @@ +@@ -23,6 +23,10 @@ #include <fcntl.h> #include <unistd.h> ++#ifndef AT_FDCWD +#define AT_FDCWD -2 ++#endif + struct allocator; |