diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
| commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
| tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/development/libraries/ustr | |
| parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
| parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
| download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip | |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ustr')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/ustr/default.nix | 42 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/ustr/va_args.patch | 23 |
2 files changed, 65 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ustr/default.nix b/nixpkgs/pkgs/development/libraries/ustr/default.nix new file mode 100644 index 000000000000..c15259c585ad --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ustr/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "ustr-${version}"; + version = "1.0.4"; + + src = fetchurl { + url = "http://www.and.org/ustr/${version}/${name}.tar.bz2"; + sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx"; + }; + + # Fixes bogus warnings that failed libsemanage + patches = [ ./va_args.patch ]; + + # Work around gcc5 switch to gnu11 + NIX_CFLAGS_COMPILE = "-std=gnu89"; + + # Fix detection of stdint.h + postPatch = '' + sed -i 's,\(have_stdint_h\)=0,\1=1,g' Makefile + sed -i 's,\(USTR_CONF_HAVE_STDINT_H\) 0,\1 1,g' ustr-import.in + ''; + + preBuild = '' + makeFlagsArray+=("prefix=$out") + makeFlagsArray+=("LDCONFIG=echo") + makeFlagsArray+=("HIDE=") + ''; + + # Remove debug libraries + postInstall = '' + find $out/lib -name \*debug\* -delete + ''; + + meta = with stdenv.lib; { + homepage = http://www.and.org/ustr/; + description = "Micro String API for C language"; + license = licenses.bsd2; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/ustr/va_args.patch b/nixpkgs/pkgs/development/libraries/ustr/va_args.patch new file mode 100644 index 000000000000..f75b537485d8 --- /dev/null +++ b/nixpkgs/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 */ |