From 81b9cc6f54bd05299d5c4b487a8c35d73b8183f4 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 29 Nov 2015 09:33:50 +0100 Subject: 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. --- pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix | 5 +++++ pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'pkgs/desktops/kde-4.14') diff --git a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix index 31245413f158..98fab7d25592 100644 --- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix +++ b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix @@ -2,6 +2,11 @@ , nepomuk_core, nepomuk_widgets, libXt }: kde { + postPatch = '' + substituteInPlace konq-plugins/validators/tidy_validator.cpp \ + --replace buffio.h tidybuffio.h + ''; + buildInputs = [ kdelibs nepomuk_core nepomuk_widgets html-tidy kactivities libXt ]; meta = { diff --git a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix index b0138ecb48b0..b593c952219c 100644 --- a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix @@ -4,6 +4,11 @@ kde { # todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old + postPatch = '' + substituteInPlace klinkstatus/src/tidy/tidyx.h \ + --replace buffio.h tidybuffio.h + ''; + buildInputs = [ kdelibs kdepimlibs html-tidy boost ]; meta = { -- cgit 1.4.1