diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-24 13:25:53 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-24 13:25:53 +0100 |
| commit | de70e3739d2e69806ddfd47efa8b21aa1864b15e (patch) | |
| tree | a36cce23a53c3a9fd9b7b4e2331572ecbfb2b76c /pkgs/development/libraries/ustr | |
| parent | f6b28fad730253d58a89776862cc12a000afbd20 (diff) | |
| download | nixlib-de70e3739d2e69806ddfd47efa8b21aa1864b15e.tar nixlib-de70e3739d2e69806ddfd47efa8b21aa1864b15e.tar.gz nixlib-de70e3739d2e69806ddfd47efa8b21aa1864b15e.tar.bz2 nixlib-de70e3739d2e69806ddfd47efa8b21aa1864b15e.tar.lz nixlib-de70e3739d2e69806ddfd47efa8b21aa1864b15e.tar.xz nixlib-de70e3739d2e69806ddfd47efa8b21aa1864b15e.tar.zst nixlib-de70e3739d2e69806ddfd47efa8b21aa1864b15e.zip | |
SELinux fixes and updates to 2012-09-24
Diffstat (limited to 'pkgs/development/libraries/ustr')
| -rw-r--r-- | pkgs/development/libraries/ustr/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/ustr/va_args.patch | 23 |
2 files changed, 27 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix index ebf9628126e2..b016a6f715c1 100644 --- a/pkgs/development/libraries/ustr/default.nix +++ b/pkgs/development/libraries/ustr/default.nix @@ -8,8 +8,11 @@ stdenv.mkDerivation rec { url = "http://www.and.org/ustr/${version}/${name}.tar.bz2"; sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx"; }; + prePatch = "substituteInPlace Makefile --replace /usr/include/ ${glibc}/include/"; + patches = [ ./va_args.patch ]; # fixes bogus warnings that failed libsemanage + makeFlags = "DESTDIR=$(out) prefix= LDCONFIG=echo"; configurePhase = "make ustr-import"; @@ -21,4 +24,4 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = [ maintainers.phreedom ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/ustr/va_args.patch b/pkgs/development/libraries/ustr/va_args.patch new file mode 100644 index 000000000000..f75b537485d8 --- /dev/null +++ b/pkgs/development/libraries/ustr/va_args.patch @@ -0,0 +1,23 @@ +diff --git a/ustr-compiler.h b/ustr-compiler.h +index 9e71276..c5f847a 100644 +--- a/ustr-compiler.h ++++ b/ustr-compiler.h +@@ -11,17 +11,11 @@ + #define USTR_CONF_HAVE_ATTR_FMT 1 + #endif + ++#include <stdarg.h> + /* We assume this is enough, + * C99 specifies that va_copy() exists and is a macro */ +-#ifdef va_copy + # define USTR_CONF_HAVE_VA_COPY 1 + # define USTR__VA_COPY(x, y) va_copy(x, y) +-#elif __va_copy +-# define USTR_CONF_HAVE_VA_COPY 1 +-# define USTR__VA_COPY(x, y) __va_copy(x, y) +-#else +-# define USTR_CONF_HAVE_VA_COPY 0 +-#endif + + #ifndef USTR_CONF_HAVE_ATTR_NONNULL + #if defined(__GNUC__) && (__GNUC__ > 3) /* not sure */ |