diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-12-04 22:38:34 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-12-04 23:04:34 +0000 |
commit | 2a230dd64d2154ceb1ad2512116498257f739753 (patch) | |
tree | 9e68ebde483bfe723b6cb0924a46e4d0b1ca8eae /pkgs/development/libraries/libunistring | |
parent | 7515cdfeb651f8d78b1ad3d412c033d1f730b8a4 (diff) |
libunistring: fix build and enable tests on darwin
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 | 10 |
2 files changed, 3 insertions, 21 deletions
diff --git a/pkgs/development/libraries/libunistring/clang.patch b/pkgs/development/libraries/libunistring/clang.patch deleted file mode 100644 index fdcbc0d528d06..0000000000000 --- a/pkgs/development/libraries/libunistring/clang.patch +++ /dev/null @@ -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 diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 0cf770af910f0..e1b8c04b4ce58 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -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/; |