Merge pull request #207041 from 2xsaiko/outgoing/harfbuzz6

harfbuzz: 5.3.1 -> 6.0.0
This commit is contained in:
Robert Scott 2023-01-04 20:17:46 +00:00 committed by GitHub
commit 6f63cf864f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,23 +32,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
version = "5.3.1"; version = "6.0.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"; url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz";
sha256 = "sha256-Smzgl7dagSH6zEuoO1sIO/7GV/RbADzVo0JPKua0Q00="; sha256 = "HRAQoXUdB21SkeQzwThQKnlNZ5p0mNEmjuIeLUoUDrQ=";
}; };
patches = [
# Pick upstream patch for exported symbol test failing on darwin
# https://github.com/harfbuzz/harfbuzz/issues/3850
(fetchpatch {
name = "harfbuzz-fix-check-symbol-tests-lto-and-darwin.patch";
url = "https://github.com/harfbuzz/harfbuzz/commit/b0b7a65388da25ae3fa01e969ad6abc67eed4f49.patch";
sha256 = "0my064r88pikw6q70hbgf6hwfkw544b9f5ai73qhn2a3c83jqn06";
})
];
postPatch = '' postPatch = ''
patchShebangs src/*.py test patchShebangs src/*.py test
'' + lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''