diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-11-29 09:33:50 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-11-29 10:32:02 +0100 |
commit | 81b9cc6f54bd05299d5c4b487a8c35d73b8183f4 (patch) | |
tree | a6e834c38b184f4534ecc19767b029d604c2dcfd /pkgs/development/libraries/mailcore2 | |
parent | f2ad4a47e8a2cdaa1f9a27e668bebef69c1403f7 (diff) |
html-tidy: unify with its drop-in replacement tidy-html5
- the original project has been unmaintained for years - some dependants needed to be patched due to renamed headers https://github.com/htacg/tidy-html5/issues/326#issuecomment-160329114 - separate tidy-html5 package was removed, as since the 5.0.0 version it's meant as a successor to both, and library name got back from libtidy5.so to libtidy.so https://github.com/htacg/tidy-html5/issues/326#issuecomment-160314666 /cc committers to tidy-html5: @edwjto and @zimbatm.
Diffstat (limited to 'pkgs/development/libraries/mailcore2')
-rw-r--r-- | pkgs/development/libraries/mailcore2/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 8cf0744a0d14f..de82bd0243e9e 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt \ --replace "tidy/tidy.h" "tidy.h" \ --replace "/usr/include/tidy" "${libtidy}/include" \ - --replace "/usr/include/libxml2" "${libxml2}/include/libxml2" \ + --replace "/usr/include/libxml2" "${libxml2}/include/libxml2" + substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ + --replace buffio.h tidybuffio.h ''; cmakeFlags = [ |