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/libunistring | |
| 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/libunistring')
| -rw-r--r-- | pkgs/development/libraries/libunistring/clang.patch | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/libunistring/default.nix | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libunistring/clang.patch b/pkgs/development/libraries/libunistring/clang.patch new file mode 100644 index 00000000000..fdcbc0d528d --- /dev/null +++ b/pkgs/development/libraries/libunistring/clang.patch @@ -0,0 +1,14 @@ +diff --git a/lib/stdint.in.h b/lib/stdint.in.h +index 997e406..e0827f5 100644 +--- a/lib/stdint.in.h ++++ b/lib/stdint.in.h +@@ -53,7 +53,8 @@ + in <inttypes.h> would reinclude us, skipping our contents because + _GL_STDINT_H is defined. + The include_next requires a split double-inclusion guard. */ +-# @INCLUDE_NEXT@ @NEXT_STDINT_H@ ++# include <inttypes.h> ++// # @INCLUDE_NEXT@ @NEXT_STDINT_H@ + #endif + + #if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 2a87d7a3249..9470240fc14 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation (rec { sha256 = "18q620269xzpw39dwvr9zpilnl2dkw5z5kz3mxaadnpv4k3kw3b1"; }; + patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ]; + propagatedBuildInputs = stdenv.lib.optional ((! (stdenv ? glibc)) || (stdenv ? cross && |