about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/fontconfig
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/fontconfig')
-rw-r--r--nixpkgs/pkgs/development/libraries/fontconfig/default.nix15
1 files changed, 13 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix
index 6c0b8899a3f4..eadb30352e9a 100644
--- a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, fetchpatch2
 , pkg-config
 , python3
 , freetype
@@ -14,15 +15,25 @@
 
 stdenv.mkDerivation rec {
   pname = "fontconfig";
-  version = "2.14.0";
+  version = "2.14.2";
 
   outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz";
-    sha256 = "3L64TJx0u/2xM9U1/hx77cnyIhqNrzkUuYTETFIOm6w=";
+    hash = "sha256-26aVtXvOFQI9LO7e+CBiwrkl5R9dTMSu9zbPE/YKRos=";
   };
 
+  patches = [
+    # Provide 11-lcdfilter-none.conf for NixOS module
+    # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/268
+    (fetchpatch2 {
+      name = "add-optional-11-lcdfilter-none-configuration.patch";
+      url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/c2666a6d9a6ed18b1bfcef8176e25f62993e24db.patch";
+      hash = "sha256-UBzkxy3uxFO+g0aQtPnBZv7OncgQdinwzNwWS8ngjcE=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     gperf