diff options
author | Vaibhav Sagar <vaibhavsagar@gmail.com> | 2018-12-13 15:28:55 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-12-14 00:27:27 -0600 |
commit | 4e19b09073e2507fd28ae71d96fcb11670b19d62 (patch) | |
tree | 11d934a90e9cd9d0d377dbc9a7817a1640ab761c /pkgs/development/libraries/attr | |
parent | 60135e9fe66d870cab423cb685ff58b13baaa918 (diff) |
attr: 2.4.47 -> 2.4.48
Diffstat (limited to 'pkgs/development/libraries/attr')
-rw-r--r-- | pkgs/development/libraries/attr/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/attr/fix-headers-musl.patch | 54 |
2 files changed, 3 insertions, 63 deletions
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index f859894cd47b..623864529f0f 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,23 +1,17 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "attr-2.4.47"; + name = "attr-2.4.48"; src = fetchurl { - url = "mirror://savannah/attr/${name}.src.tar.gz"; - sha256 = "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5"; + url = "mirror://savannah/attr/${name}.tar.gz"; + sha256 = "1rr4adzwax4bzr2c00f06zcsljv5y6p9wymz1g89ww7cb2rp5bay"; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; nativeBuildInputs = [ gettext ]; - configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ECHO=echo" "SED=sed" "AWK=gawk" ]; - - installTargets = [ "install" "install-lib" "install-dev" ]; - - patches = if (stdenv.hostPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null; - postPatch = '' for script in install-sh include/install-sh; do patchShebangs $script diff --git a/pkgs/development/libraries/attr/fix-headers-musl.patch b/pkgs/development/libraries/attr/fix-headers-musl.patch deleted file mode 100644 index e969f640eeef..000000000000 --- a/pkgs/development/libraries/attr/fix-headers-musl.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- 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__ */ |