From 0ccf34039cf5d68dbc70d26addc3208464553500 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 11 Mar 2015 16:53:24 +0100 Subject: xorg.mxfontscale: Fix segfault with some fonts. The update to version 1.1.2 in 9c22c1b introduces a segfault when mkfontscale is processing fonts where the family name is missing. Applies a patch from Stefan Dirsch to be found at: https://bugs.freedesktop.org/show_bug.cgi?id=89409 Signed-off-by: aszlig --- pkgs/servers/x11/xorg/overrides.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs/servers/x11/xorg/overrides.nix') diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bb3be6e8b51..5a2fd0ba46e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -61,6 +61,15 @@ in preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin"; }; + mkfontscale = attrs: attrs // { + patches = lib.singleton (args.fetchpatch { + name = "mkfontscale-fix-sig11.patch"; + url = "https://bugs.freedesktop.org/attachment.cgi?id=113951"; + sha256 = "0i2xf768mz8kvm7i514v0myna9m6jqw82f9a03idabdpamxvwnim"; + }); + patchFlags = [ "-p0" ]; + }; + libxcb = attrs : attrs // { nativeBuildInputs = [ args.python ]; configureFlags = "--enable-xkb"; -- cgit 1.4.1