Merge pull request #129675 from andresilva/fontconfig-2.13.94

fontconfig: 2.13.93 -> 2.13.94
This commit is contained in:
Sandro 2021-07-09 12:20:03 +02:00 committed by GitHub
commit df4f7d0155
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,4 @@
{ lib, stdenv { lib, stdenv
, fetchpatch
, substituteAll , substituteAll
, fetchurl , fetchurl
, pkg-config , pkg-config
@ -15,21 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fontconfig"; pname = "fontconfig";
version = "2.13.93"; version = "2.13.94";
src = fetchurl { src = fetchurl {
url = "http://fontconfig.org/release/${pname}-${version}.tar.xz"; url = "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz";
sha256 = "1850q4k80yxma5g3yxkvyv8i5a3xqzswwml8gjy3jmywx8qqd5pa"; sha256 = "0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55";
}; };
patches = [
# Fix build with no docbook2html.
(fetchpatch {
url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/60ce9b695ee9d1ac514a61f562e210d3278ba605.patch";
sha256 = "0hfd2jdvsgackdp29dyzf5b1277pnbacihxqh9vdn63rr932ipra";
})
];
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
nativeBuildInputs = [ nativeBuildInputs = [