diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-03-11 16:53:24 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-03-11 16:57:21 +0100 |
| commit | 0ccf34039cf5d68dbc70d26addc3208464553500 (patch) | |
| tree | 8440869852313e1423db75ec9c7421b921d269a5 /pkgs/servers/x11 | |
| parent | fe79bf34a5f982b7cd85734a2866215b73dd1841 (diff) | |
| download | nixlib-0ccf34039cf5d68dbc70d26addc3208464553500.tar nixlib-0ccf34039cf5d68dbc70d26addc3208464553500.tar.gz nixlib-0ccf34039cf5d68dbc70d26addc3208464553500.tar.bz2 nixlib-0ccf34039cf5d68dbc70d26addc3208464553500.tar.lz nixlib-0ccf34039cf5d68dbc70d26addc3208464553500.tar.xz nixlib-0ccf34039cf5d68dbc70d26addc3208464553500.tar.zst nixlib-0ccf34039cf5d68dbc70d26addc3208464553500.zip | |
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 <sndirsch@suse.com> to be found at: https://bugs.freedesktop.org/show_bug.cgi?id=89409 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bb3be6e8b51f..5a2fd0ba46ed 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"; |