diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-09 19:47:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-17 09:00:29 +0200 |
| commit | c50f0e47e14d2dec088ce4b9bed6228232607869 (patch) | |
| tree | 0886e6b1933cc07412a6acb4de90fd91f4962911 /pkgs/servers/x11 | |
| parent | ff327554e97acfe27d0817b81da65e27aacbe1f7 (diff) | |
| download | nixlib-c50f0e47e14d2dec088ce4b9bed6228232607869.tar nixlib-c50f0e47e14d2dec088ce4b9bed6228232607869.tar.gz nixlib-c50f0e47e14d2dec088ce4b9bed6228232607869.tar.bz2 nixlib-c50f0e47e14d2dec088ce4b9bed6228232607869.tar.lz nixlib-c50f0e47e14d2dec088ce4b9bed6228232607869.tar.xz nixlib-c50f0e47e14d2dec088ce4b9bed6228232607869.tar.zst nixlib-c50f0e47e14d2dec088ce4b9bed6228232607869.zip | |
freetype: major update, including some CVE security
- There's no fontconfig update yet, as I failed to debug it yet. - Infinality patches are now taken from a different (maintained) source.
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bb97eadef462..e5aad4aea406 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -73,6 +73,10 @@ in ''; }; + libXfont = attrs: attrs // { + propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2 + }; + libXxf86vm = attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; }; @@ -111,6 +115,10 @@ in libXft = attrs: attrs // { propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; + # the include files need ft2build.h, and Requires.private isn't enough for us + postInstall = '' + sed "/^Requires:/s/$/, freetype2/" -i "$out/lib/pkgconfig/xft.pc" + ''; }; libXext = attrs: attrs // { |