about summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2019-01-13 10:38:32 +0100
committerVladimír Čunát <vcunat@gmail.com>2019-01-13 10:38:32 +0100
commit626233eee6ea309733d2d98625750cca904799a5 (patch)
tree103361d68eea9630570c9868e8e4bd063a87b61a /pkgs/applications/virtualization
parent61b8c03a78caa35a52ac6364106a8d3a46960294 (diff)
downloadnixlib-626233eee6ea309733d2d98625750cca904799a5.tar
nixlib-626233eee6ea309733d2d98625750cca904799a5.tar.gz
nixlib-626233eee6ea309733d2d98625750cca904799a5.tar.bz2
nixlib-626233eee6ea309733d2d98625750cca904799a5.tar.lz
nixlib-626233eee6ea309733d2d98625750cca904799a5.tar.xz
nixlib-626233eee6ea309733d2d98625750cca904799a5.tar.zst
nixlib-626233eee6ea309733d2d98625750cca904799a5.zip
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
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/virtualbox/guest-additions/default.nix2
1 files changed, 1 insertions, 1 deletions
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 {