diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-10 01:25:52 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-10 01:30:34 -0400 |
| commit | 67e6e031e1af73f1edfdecf1931b21ecd393e5c1 (patch) | |
| tree | 006185139dc5bd96d99282b991f23ab614d7733f /pkgs/development/libraries/readline | |
| parent | 589c2c2870340c21b799795f6ed3b09608676499 (diff) | |
| download | nixpkgs-67e6e031e1af73f1edfdecf1931b21ecd393e5c1.tar nixpkgs-67e6e031e1af73f1edfdecf1931b21ecd393e5c1.tar.gz nixpkgs-67e6e031e1af73f1edfdecf1931b21ecd393e5c1.tar.bz2 nixpkgs-67e6e031e1af73f1edfdecf1931b21ecd393e5c1.tar.lz nixpkgs-67e6e031e1af73f1edfdecf1931b21ecd393e5c1.tar.xz nixpkgs-67e6e031e1af73f1edfdecf1931b21ecd393e5c1.tar.zst nixpkgs-67e6e031e1af73f1edfdecf1931b21ecd393e5c1.zip | |
readline: add android patch
Diffstat (limited to 'pkgs/development/libraries/readline')
| -rw-r--r-- | pkgs/development/libraries/readline/6.3.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/readline/android.patch | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index cbe6c083cb4..f9a20a535cb 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./link-against-ncurses.patch ./no-arch_only-6.3.patch - ] + ] ++ stdenv.lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch ++ (let patch = nr: sha256: diff --git a/pkgs/development/libraries/readline/android.patch b/pkgs/development/libraries/readline/android.patch new file mode 100644 index 00000000000..7e81774be36 --- /dev/null +++ b/pkgs/development/libraries/readline/android.patch @@ -0,0 +1,16 @@ +diff --git histlib.h histlib.h +index c938a10..925ab72 100644 +--- histlib.h ++++ histlib.h +@@ -51,9 +51,9 @@ + #endif + + #ifndef member +-# ifndef strchr ++# if !defined (strchr) && !defined (__STDC__) + extern char *strchr (); +-# endif ++# endif /* !strchr && !__STDC__ */ + #define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0) + #endif + |