xorg-server: use 1.18 branch on Darwin for now

Fixes #23027.  I'm no good in truly fixing it on Darwin,
leaving to others.
This commit is contained in:
Vladimír Čunát 2017-02-21 00:46:32 +01:00
parent b87be6e8ec
commit 10d48574eb
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -10869,7 +10869,8 @@ with pkgs;
python = python2; # Incompatible with Python 3x
udev = if stdenv.isLinux then udev else null;
libdrm = if stdenv.isLinux then libdrm else null;
abiCompat = config.xorg.abiCompat or null; # `config` because we have no `xorg.override`
abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`
or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
} // { inherit xlibsWrapper; } );
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };