From 626233eee6ea309733d2d98625750cca904799a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 13 Jan 2019 10:38:32 +0100 Subject: [PATCH] linuxPackages.virtualboxGuestAdditions: fix build after xorg 1.20 We still need to force the ABI version to 118 it seems. Close https://github.com/NixOS/nixpkgs/pull/53867 --- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 2ed0fb5cabd4..259f2b268fe3 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -11,7 +11,7 @@ let # (not via videoDrivers = ["vboxvideo"]). # It's likely to work again in some future update. xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1; - in if abi == "119" then "118" else abi; + in if abi == "119" || abi == "120" then "118" else abi; in stdenv.mkDerivation {