Merge pull request #173736 from sikmir/html-tidy

html-tidy: fix cross-compilation
main
Rick van Schijndel 2 years ago committed by GitHub
commit 4ae5d09ae4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      pkgs/tools/text/html-tidy/default.nix

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, libxslt }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libxslt, html-tidy }:
stdenv.mkDerivation rec {
pname = "html-tidy";
@ -11,9 +11,18 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ZMz0NySxzX2XHiqB8f5asvwjIG6kdIcq8Gb3EbAxBaU=";
};
nativeBuildInputs = [ cmake libxslt/*manpage*/ ];
# https://github.com/htacg/tidy-html5/pull/1036
patches = (fetchpatch {
url = "https://github.com/htacg/tidy-html5/commit/e9aa038bd06bd8197a0dc049380bc2945ff55b29.diff";
sha256 = "sha256-Q2GjinNBWLL+HXUtslzDJ7CJSTflckbjweiSMCnIVwg=";
});
cmakeFlags = [];
nativeBuildInputs = [ cmake libxslt/*manpage*/ ]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) html-tidy;
cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DHOST_TIDY=tidy"
];
# ATM bin/tidy is statically linked, as upstream provides no other option yet.
# https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107

Loading…
Cancel
Save