summary refs log tree commit diff
path: root/pkgs/servers/x11/xorg
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-12-03 16:22:12 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-12-03 16:23:45 +0100
commite001bd2c2f698037c6968608523c609cddac813b (patch)
treea373907fb925100bf2c7fe1bf0b083f8bb5b7231 /pkgs/servers/x11/xorg
parent17218f0bac909dc62bf9ed70238cbee62d9e44fd (diff)
downloadnixlib-e001bd2c2f698037c6968608523c609cddac813b.tar
nixlib-e001bd2c2f698037c6968608523c609cddac813b.tar.gz
nixlib-e001bd2c2f698037c6968608523c609cddac813b.tar.bz2
nixlib-e001bd2c2f698037c6968608523c609cddac813b.tar.lz
nixlib-e001bd2c2f698037c6968608523c609cddac813b.tar.xz
nixlib-e001bd2c2f698037c6968608523c609cddac813b.tar.zst
nixlib-e001bd2c2f698037c6968608523c609cddac813b.zip
xorg-server-1.18: fixup build with glibc-2.26
It's non-default version required by amdgpu-pro ATM.  Thanks to Mounium.
Diffstat (limited to 'pkgs/servers/x11/xorg')
-rw-r--r--pkgs/servers/x11/xorg/overrides.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8f235df2617c..ca1a773c4a28 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -450,6 +450,7 @@ in
             };
             nativeBuildInputs = [ pkgconfig ];
             buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
+            postPatch = "sed '1i#include <malloc.h>' -i include/os.h";
             meta.platforms = stdenv.lib.platforms.unix;
         } else throw "unsupported xorg abiCompat: ${args.abiCompat}";