diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-07 16:35:04 +0000 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2019-11-09 10:34:50 +0000 |
| commit | a6929e9ff3f8e521bd0d2b892c57a50c7e660553 (patch) | |
| tree | 9ff0ccb8c5f8b65562ab1c9c8c0a4df014a587bb /pkgs/servers/x11/xorg/overrides.nix | |
| parent | 1733a6f94156b849a8b8b567607cd693615ff6b1 (diff) | |
| download | nixlib-a6929e9ff3f8e521bd0d2b892c57a50c7e660553.tar nixlib-a6929e9ff3f8e521bd0d2b892c57a50c7e660553.tar.gz nixlib-a6929e9ff3f8e521bd0d2b892c57a50c7e660553.tar.bz2 nixlib-a6929e9ff3f8e521bd0d2b892c57a50c7e660553.tar.lz nixlib-a6929e9ff3f8e521bd0d2b892c57a50c7e660553.tar.xz nixlib-a6929e9ff3f8e521bd0d2b892c57a50c7e660553.tar.zst nixlib-a6929e9ff3f8e521bd0d2b892c57a50c7e660553.zip | |
xorg.xorgserver: Fix build with mesa 19.2.3
Diffstat (limited to 'pkgs/servers/x11/xorg/overrides.nix')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index e6a94daee106..71ac752a6cf6 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -592,6 +592,16 @@ self: super: propagatedBuildInputs = [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; + # patchPhase is not working, this is a hack but we can remove it in the next xorg-server release + preConfigure = let + headerFix = fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/commit/741bd73429e337071f49509ddcc5fb392e20b0f6.patch"; + sha256 = "0qjiin9pkggl3c33lfkpn9a9z8ldjpb3y47cflsjkfn868gsk8ri"; + excludes = [ "hw/xwayland/xwayland-glx.c" ]; # File not in release yet + }; + in '' + patch -p1 < ${headerFix} + ''; prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" ''; @@ -629,8 +639,8 @@ self: super: libAppleWM xorgproto ]; - # XQuartz patchset patches = [ + # XQuartz patchset (fetchpatch { url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch"; sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k"; |