libunistring: fix build and enable tests on darwin

This commit is contained in:
Orivej Desh 2017-12-04 22:38:34 +00:00
parent 7515cdfeb6
commit 2a230dd64d
2 changed files with 3 additions and 21 deletions

View file

@ -1,14 +0,0 @@
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

View file

@ -9,21 +9,17 @@ stdenv.mkDerivation rec {
sha256 = "1x9wnpzg7vxyjpnzab6vw0afbcijfbd57qrrkqrppynh0nyz54mp";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch stdenv.secure-format-patch ];
outputs = [ "out" "dev" "info" "doc" ];
propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
enableParallelBuilding = false;
configureFlags = [
"--with-libiconv-prefix=${libiconv}"
];
# XXX: There are test failures on non-GNU systems, see
# http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html .
doCheck = (stdenv ? glibc) && (stdenv.hostPlatform == stdenv.buildPlatform);
doCheck = true;
enableParallelBuilding = true;
meta = {
homepage = http://www.gnu.org/software/libunistring/;