tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
cygwin: libedit patch for cygwin
Rok Garbas
10 years ago
0a7c5e4f
da10587d
+29
2 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
libedit
01-cygwin.patch
default.nix
+25
pkgs/development/libraries/libedit/01-cygwin.patch
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
···
1
+
--- libedit-20120311-3.0/src/chartype.h 2012-03-11 10:54:58.000000000 +0100
2
+
+++ libedit-20120311-3.0/src/chartype.h 2012-05-03 19:00:20.651847423 +0200
3
+
@@ -56,9 +56,11 @@
4
+
/* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
5
+
* ref: ISO/IEC DTR 19769
6
+
*/
7
+
+#ifndef __CYGWIN__
8
+
#if WCHAR_MAX < INT32_MAX
9
+
#warning Build environment does not support non-BMP characters
10
+
#endif
11
+
+#endif
12
+
13
+
#ifndef HAVE_WCSDUP
14
+
wchar_t *wcsdup(const wchar_t *s);
15
+
--- libedit-20120311-3.0/src/editline/readline.h 2011-02-26 23:42:59.000000000 +0100
16
+
+++ libedit-20120311-3.0/src/editline/readline.h 2012-05-03 19:00:49.211244803 +0200
17
+
@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap;
18
+
19
+
#ifndef CTRL
20
+
#include <sys/ioctl.h>
21
+
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
22
+
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__CYGWIN__)
23
+
#include <sys/ttydefaults.h>
24
+
#endif
25
+
#ifndef CTRL
+4
pkgs/development/libraries/libedit/default.nix
···
11
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
12
NROFF = "${groff}/bin/nroff";
13
0
0
0
0
14
postInstall = ''
15
sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
16
'';
···
11
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
12
NROFF = "${groff}/bin/nroff";
13
14
+
patches = if stdenv.isCygwin then [
15
+
./01-cygwin.patch
16
+
] else null;
17
+
18
postInstall = ''
19
sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
20
'';