diff options
| author | Joel Taylor <me@joelt.io> | 2014-08-17 13:17:13 -0700 |
|---|---|---|
| committer | Joel Taylor <me@joelt.io> | 2014-09-09 13:54:24 -0700 |
| commit | 3e8344d334d42824ac3061a919ac15b19a1bf21d (patch) | |
| tree | 5ecad4218357caec8ddc27d5df150a5734db0281 /pkgs/development/libraries/aspell | |
| parent | e3fd4499ef296f4769cf4e9e91f1ccfd16325b0f (diff) | |
| download | nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.gz nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.bz2 nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.lz nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.xz nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.zst nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.zip | |
suitable clang stdenv
Diffstat (limited to 'pkgs/development/libraries/aspell')
| -rw-r--r-- | pkgs/development/libraries/aspell/clang.patch | 18 | ||||
| -rw-r--r-- | pkgs/development/libraries/aspell/default.nix | 4 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/development/libraries/aspell/clang.patch b/pkgs/development/libraries/aspell/clang.patch new file mode 100644 index 00000000000..c4cfa426588 --- /dev/null +++ b/pkgs/development/libraries/aspell/clang.patch @@ -0,0 +1,18 @@ +--- interfaces/cc/aspell.h 2013-10-13 20:29:33.000000000 +0200 ++++ interfaces/cc/aspell.h 2013-10-13 20:30:01.000000000 +0200 +@@ -237,6 +237,7 @@ + /******************************** errors ********************************/ + + ++#ifndef __cplusplus + extern const struct AspellErrorInfo * const aerror_other; + extern const struct AspellErrorInfo * const aerror_operation_not_supported; + extern const struct AspellErrorInfo * const aerror_cant_copy; +@@ -322,6 +323,7 @@ + extern const struct AspellErrorInfo * const aerror_bad_magic; + extern const struct AspellErrorInfo * const aerror_expression; + extern const struct AspellErrorInfo * const aerror_invalid_expression; ++#endif + + + /******************************* speller *******************************/ diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 734bcc0797c..a8d660e89a7 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"; }; + patchPhase = '' + patch interfaces/cc/aspell.h < ${./clang.patch} + ''; + buildInputs = [ perl ]; doCheck = true; |