diff options
| author | Will Dietz <w@wdtz.org> | 2018-01-03 16:16:35 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:36 -0600 |
| commit | 65c9c38a21c0b944ddcf1cd014663d6ee40b6793 (patch) | |
| tree | 8f7ecb4165da0e30541fcb30beb7385a21c57cbc | |
| parent | b42c8af907f66127119ff47eeff8e63a9b5615d7 (diff) | |
| download | nixpkgs-65c9c38a21c0b944ddcf1cd014663d6ee40b6793.tar nixpkgs-65c9c38a21c0b944ddcf1cd014663d6ee40b6793.tar.gz nixpkgs-65c9c38a21c0b944ddcf1cd014663d6ee40b6793.tar.bz2 nixpkgs-65c9c38a21c0b944ddcf1cd014663d6ee40b6793.tar.lz nixpkgs-65c9c38a21c0b944ddcf1cd014663d6ee40b6793.tar.xz nixpkgs-65c9c38a21c0b944ddcf1cd014663d6ee40b6793.tar.zst nixpkgs-65c9c38a21c0b944ddcf1cd014663d6ee40b6793.zip | |
attr: patch to fix headers w/musl
| -rw-r--r-- | pkgs/development/libraries/attr/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/attr/fix-headers-musl.patch | 54 |
2 files changed, 57 insertions, 1 deletions
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 6a94cb0c0e2..05d9b842e65 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ stdenv, fetchurl, gettext, targetPlatform }: stdenv.mkDerivation rec { name = "attr-2.4.47"; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { installTargets = "install install-lib install-dev"; + patches = if (targetPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null; + meta = { homepage = http://savannah.nongnu.org/projects/attr/; description = "Library and tools for manipulating extended attributes"; diff --git a/pkgs/development/libraries/attr/fix-headers-musl.patch b/pkgs/development/libraries/attr/fix-headers-musl.patch new file mode 100644 index 00000000000..e969f640eee --- /dev/null +++ b/pkgs/development/libraries/attr/fix-headers-musl.patch @@ -0,0 +1,54 @@ +--- attr-2.4.47/include/xattr.h ++++ attr-2.4.47/include/xattr.h +@@ -31,33 +31,37 @@ + #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ + + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + extern int setxattr (const char *__path, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + extern int lsetxattr (const char *__path, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + extern int fsetxattr (int __filedes, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + + extern ssize_t getxattr (const char *__path, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + extern ssize_t lgetxattr (const char *__path, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + extern ssize_t fgetxattr (int __filedes, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + + extern ssize_t listxattr (const char *__path, char *__list, +- size_t __size) __THROW; ++ size_t __size); + extern ssize_t llistxattr (const char *__path, char *__list, +- size_t __size) __THROW; ++ size_t __size); + extern ssize_t flistxattr (int __filedes, char *__list, +- size_t __size) __THROW; ++ size_t __size); + +-extern int removexattr (const char *__path, const char *__name) __THROW; +-extern int lremovexattr (const char *__path, const char *__name) __THROW; +-extern int fremovexattr (int __filedes, const char *__name) __THROW; ++extern int removexattr (const char *__path, const char *__name); ++extern int lremovexattr (const char *__path, const char *__name); ++extern int fremovexattr (int __filedes, const char *__name); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif /* __XATTR_H__ */ |