public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libunistring: 0.9.3 -> 0.9.6

Browse Source
This commit is contained in:
William A. Kennington III 2015-07-09 17:31:06 -07:00
parent bf32753cd9
commit 07ba299003
1 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/development/libraries/libunistring/default.nix
View File

@ -1,24 +1,24 @@
{ fetchurl, stdenv, libiconv }: { fetchurl, stdenv, libiconv }:
stdenv.mkDerivation (rec { stdenv.mkDerivation rec {
name = "libunistring-0.9.3"; name = "libunistring-0.9.6";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/libunistring/${name}.tar.gz"; url = "mirror://gnu/libunistring/${name}.tar.gz";
sha256 = "18q620269xzpw39dwvr9zpilnl2dkw5z5kz3mxaadnpv4k3kw3b1"; sha256 = "0ixxmgpgh2v8ifm6hbwsjxl023myk3dfnj7wnvmqjivza31fw9cn";
}; };
patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ]; patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ];
propagatedBuildInputs = propagatedBuildInputs = [ libiconv ];
stdenv.lib.optional ((! (stdenv ? glibc))
|| (stdenv ? cross && configureFlags = [
stdenv.cross.config == "i686-pc-mingw32")) "--with-libiconv-prefix=${libiconv}"
libiconv; ];
# XXX: There are test failures on non-GNU systems, see # XXX: There are test failures on non-GNU systems, see
# http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html . # http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html .
doCheck = (stdenv ? glibc); doCheck = stdenv ? glibc;
meta = { meta = {
homepage = http://www.gnu.org/software/libunistring/; homepage = http://www.gnu.org/software/libunistring/;
@ -52,19 +52,3 @@ stdenv.mkDerivation (rec {
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }
//
# On Cygwin Libtool is unable to find `libiconv.dll' if there's no explicit
# `-L/path/to/libiconv' argument on the linker's command line; and since it
# can't find the dll, it will only create a static library.
(if (stdenv ? glibc)
then {}
else { configureFlags = "--with-libiconv-prefix=${libiconv}"; })
//
# Don't run the native `strip' when cross-compiling.
(if (stdenv ? cross)
then { dontStrip = true; }
else { }))