diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libedit')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libedit/01-cygwin.patch | 25 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libedit/default.nix | 43 |
2 files changed, 0 insertions, 68 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libedit/01-cygwin.patch b/nixpkgs/pkgs/development/libraries/libedit/01-cygwin.patch deleted file mode 100644 index 33bd39ed61e5..000000000000 --- a/nixpkgs/pkgs/development/libraries/libedit/01-cygwin.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libedit-20120311-3.0/src/chartype.h 2012-03-11 10:54:58.000000000 +0100 -+++ libedit-20120311-3.0/src/chartype.h 2012-05-03 19:00:20.651847423 +0200 -@@ -56,9 +56,11 @@ - /* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it... - * ref: ISO/IEC DTR 19769 - */ -+#ifndef __CYGWIN__ - #if WCHAR_MAX < INT32_MAX - #warning Build environment does not support non-BMP characters - #endif -+#endif - - #ifndef HAVE_WCSDUP - wchar_t *wcsdup(const wchar_t *s); ---- libedit-20120311-3.0/src/editline/readline.h 2011-02-26 23:42:59.000000000 +0100 -+++ libedit-20120311-3.0/src/editline/readline.h 2012-05-03 19:00:49.211244803 +0200 -@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap; - - #ifndef CTRL - #include <sys/ioctl.h> --#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) -+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__CYGWIN__) - #include <sys/ttydefaults.h> - #endif - #ifndef CTRL diff --git a/nixpkgs/pkgs/development/libraries/libedit/default.nix b/nixpkgs/pkgs/development/libraries/libedit/default.nix deleted file mode 100644 index 97636e36e848..000000000000 --- a/nixpkgs/pkgs/development/libraries/libedit/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses }: - -stdenv.mkDerivation rec { - pname = "libedit"; - version = "20230828-3.1"; - - src = fetchurl { - url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz"; - sha256 = "sha256-TugYK25WkpDn0fRPD3jayHFrNfZWt2Uo9pnGnJiBTa0="; - }; - - outputs = [ "out" "dev" ]; - - # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. - # NROFF = "${groff}/bin/nroff"; - - # GCC automatically include `stdc-predefs.h` while Clang does not do - # this by default. While Musl is ISO 10646 compliant, doesn't define - # __STDC_ISO_10646__. This definition is in `stdc-predefs.h` that's - # why libedit builds just fine with GCC and Musl. - # There is a DR to fix this issue with Clang which is not merged - # yet. - # https://reviews.llvm.org/D137043 - env.NIX_CFLAGS_COMPILE = - lib.optionalString (stdenv.targetPlatform.isMusl && stdenv.cc.isClang) - "-D__STDC_ISO_10646__=201103L"; - - patches = [ ./01-cygwin.patch ]; - - propagatedBuildInputs = [ ncurses ]; - - postInstall = '' - find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \ - -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g' - ''; - - meta = with lib; { - homepage = "http://www.thrysoee.dk/editline/"; - description = "A port of the NetBSD Editline library (libedit)"; - license = licenses.bsd3; - platforms = platforms.all; - }; -} |