diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-16 14:08:46 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-16 14:21:54 -0700 |
| commit | 57ee8d6131fa4f44f5bdd93a95fb103cf504ae58 (patch) | |
| tree | b7342bf5720bc7693f379913a21398b613eaf3c4 /pkgs/servers/x11 | |
| parent | f2c84ffeb28e2681ef00bd339d4b92a681c082a0 (diff) | |
| download | nixlib-57ee8d6131fa4f44f5bdd93a95fb103cf504ae58.tar nixlib-57ee8d6131fa4f44f5bdd93a95fb103cf504ae58.tar.gz nixlib-57ee8d6131fa4f44f5bdd93a95fb103cf504ae58.tar.bz2 nixlib-57ee8d6131fa4f44f5bdd93a95fb103cf504ae58.tar.lz nixlib-57ee8d6131fa4f44f5bdd93a95fb103cf504ae58.tar.xz nixlib-57ee8d6131fa4f44f5bdd93a95fb103cf504ae58.tar.zst nixlib-57ee8d6131fa4f44f5bdd93a95fb103cf504ae58.zip | |
xorgserver: Add gcc5 compat patch
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1ef0d88ce3a2..eaa3055827f4 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -294,7 +294,7 @@ in libpciaccess inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; - commonPatches = [ ./xorgserver-xkbcomp-path.patch ] + commonPatches = [ ./xorgserver-xkbcomp-path.patch ./xorgserver-gcc5.patch ] ++ lib.optional isDarwin ./fix-clang.patch; # XQuartz requires two compilations: the first to get X / XQuartz, # and the second to get Xvfb, Xnest, etc. |