diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libxml2')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libxml2/default.nix | 93 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch | 30 |
2 files changed, 123 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix new file mode 100644 index 000000000000..ca3cbc4a1884 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -0,0 +1,93 @@ +{ stdenv, lib, fetchurl +, zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs +, pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform +, icuSupport ? false, icu ? null +, enableShared ? stdenv.hostPlatform.libc != "msvcrt" +, enableStatic ? !enableShared +}: + +stdenv.mkDerivation rec { + pname = "libxml2"; + version = "2.9.12"; + + src = fetchurl { + url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; + sha256 = "14hxwzmf5xqppx77z7i0ni9lpzg1a84dqpf8j8l1fvy570g6imn8"; + }; + patches = [ + # Upstream bugs: + # https://bugzilla.gnome.org/show_bug.cgi?id=789714 + # https://gitlab.gnome.org/GNOME/libxml2/issues/64 + # Patch from https://bugzilla.opensuse.org/show_bug.cgi?id=1065270 , + # but only the UTF-8 part. + # Can also be mitigated by fixing malformed XML inputs, such as in + # https://gitlab.gnome.org/GNOME/gnumeric/merge_requests/3 . + # Other discussion: + # https://github.com/itstool/itstool/issues/22 + # https://github.com/NixOS/nixpkgs/pull/63174 + # https://github.com/NixOS/nixpkgs/pull/72342 + ./utf8-xmlErrorFuncHandler.patch + ]; + + outputs = [ "bin" "dev" "out" "man" "doc" ] + ++ lib.optional pythonSupport "py" + ++ lib.optional (enableStatic && enableShared) "static"; + + buildInputs = lib.optional pythonSupport python + ++ lib.optional (pythonSupport && python?isPy2 && python.isPy2) gettext + ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses + ++ lib.optional (stdenv.isDarwin && + pythonSupport && python?isPy2 && python.isPy2) libintl + # Libxml2 has an optional dependency on liblzma. However, on impure + # platforms, it may end up using that from /usr/lib, and thus lack a + # RUNPATH for that, leading to undefined references for its users. + ++ lib.optional stdenv.isFreeBSD xz; + + propagatedBuildInputs = [ zlib findXMLCatalogs ] ++ lib.optional icuSupport icu; + + configureFlags = [ + "--exec_prefix=$dev" + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + (lib.withFeature icuSupport "icu") + (lib.withFeatureAs pythonSupport "python" python) + ]; + + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + MACOSX_DEPLOYMENT_TARGET=10.16 + ''; + + enableParallelBuilding = true; + + # disable test that's problematic with newer pythons: see + # https://mail.gnome.org/archives/xml/2017-August/msg00014.html + preCheck = lib.optionalString (pythonSupport && !(python?pythonOlder && python.pythonOlder "3.5")) '' + echo "" > python/tests/tstLastError.py + ''; + + doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin && + stdenv.hostPlatform.libc != "musl"; + + preInstall = lib.optionalString pythonSupport + ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; + installFlags = lib.optional pythonSupport + "pythondir=\"${placeholder "py"}/lib/${python.libPrefix}/site-packages\""; + + postFixup = '' + moveToOutput bin/xml2-config "$dev" + moveToOutput lib/xml2Conf.sh "$dev" + moveToOutput share/man/man1 "$bin" + '' + lib.optionalString (enableStatic && enableShared) '' + moveToOutput lib/libxml2.a "$static" + ''; + + passthru = { inherit version; pythonSupport = pythonSupport; }; + + meta = { + homepage = "http://xmlsoft.org/"; + description = "An XML parsing library for C"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.eelco ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch b/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch new file mode 100644 index 000000000000..9f4c99b09341 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch @@ -0,0 +1,30 @@ +Index: libxml2-2.9.5/python/libxml.c +=================================================================== +--- libxml2-2.9.5.orig/python/libxml.c ++++ libxml2-2.9.5/python/libxml.c +@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + PyObject *message; + PyObject *result; + char str[1000]; ++ unsigned char *ptr = (unsigned char *)str; + + #ifdef DEBUG_ERROR + printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); +@@ -1636,10 +1637,16 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + str[999] = 0; + va_end(ap); + ++#if PY_MAJOR_VERSION >= 3 ++ /* Ensure the error string doesn't start at UTF8 continuation. */ ++ while (*ptr && (*ptr & 0xc0) == 0x80) ++ ptr++; ++#endif ++ + list = PyTuple_New(2); + PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); + Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); +- message = libxml_charPtrConstWrap(str); ++ message = libxml_charPtrConstWrap(ptr); + PyTuple_SetItem(list, 1, message); + result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); + Py_XDECREF(list); |