diff options
| author | janus <janus@xn--kn-1ia.guru> | 2015-11-26 17:33:58 +0000 |
|---|---|---|
| committer | janus <janus@xn--kn-1ia.guru> | 2016-01-01 17:01:13 +0000 |
| commit | 9897b356612c4bb06a9c9d688da52134dfe8fb95 (patch) | |
| tree | d4a41b097c29781ba05d8635d0296f94cc95a9c4 /pkgs/development/libraries/libedit | |
| parent | f351aaaf85c6b6323660db6ce638f057947a333f (diff) | |
| download | nixlib-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar nixlib-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar.gz nixlib-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar.bz2 nixlib-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar.lz nixlib-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar.xz nixlib-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar.zst nixlib-9897b356612c4bb06a9c9d688da52134dfe8fb95.zip | |
FreeBSD: patch expat, kerberos, libedit, ossp-uuid, lz4, sharutils, add libelf-freebsd
Diffstat (limited to 'pkgs/development/libraries/libedit')
| -rw-r--r-- | pkgs/development/libraries/libedit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libedit/freebsd-wchar.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index dc8ecf7e95d8..5234c16e1354 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = if stdenv.isCygwin then [ ./01-cygwin.patch - ] else null; + ] else [ ] ++ [ ./freebsd-wchar.patch ]; postInstall = '' find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \ diff --git a/pkgs/development/libraries/libedit/freebsd-wchar.patch b/pkgs/development/libraries/libedit/freebsd-wchar.patch new file mode 100644 index 000000000000..6bf7fb0ef69a --- /dev/null +++ b/pkgs/development/libraries/libedit/freebsd-wchar.patch @@ -0,0 +1,13 @@ +diff --git a/src/chartype.h b/src/chartype.h +index 0beee17..4ac86f3 100644 +--- a/src/chartype.h ++++ b/src/chartype.h +@@ -44,7 +44,7 @@ + * supports non-BMP code points without requiring UTF-16, but nothing + * seems to actually advertise this properly, despite Unicode 3.1 having + * been around since 2001... */ +-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) + #ifndef __STDC_ISO_10646__ + /* In many places it is assumed that the first 127 code points are ASCII + * compatible, so ensure wchar_t indeed does ISO 10646 and not some other |