From 54979403b99d476dcd2d025af254aafda81c4b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Apr 2022 10:08:25 +0200 Subject: [PATCH 1/2] linuxPackages.virtualboxGuestAdditions: xserverABI Fix build after xorg-server upgrade. I suppose we'll keep using 118? vboxvideo_drv_13.so vboxvideo_drv_14.so vboxvideo_drv_15.so vboxvideo_drv_16.so vboxvideo_drv_17.so vboxvideo_drv_18.so vboxvideo_drv_19.so vboxvideo_drv_70.so vboxvideo_drv_71.so vboxvideo_drv_110.so vboxvideo_drv_111.so vboxvideo_drv_112.so vboxvideo_drv_113.so vboxvideo_drv_114.so vboxvideo_drv_115.so vboxvideo_drv_116.so vboxvideo_drv_117.so vboxvideo_drv_118.so --- .../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 865dcad157bd..50c0dc8fa041 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" || abi == "120" then "118" else abi; + in if abi == "119" || abi == "120" || abi == "211" then "118" else abi; # Specifies how to patch binaries to make sure that libraries loaded using # dlopen are found. We grep binaries for specific library names and patch From b8c192b98e13d09be3789e527f1f2358d46666f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 19 Apr 2022 14:19:30 +0200 Subject: [PATCH 2/2] linuxPackages.virtualboxGuestAdditions: xserverABI cleanup --- .../virtualbox/guest-additions/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 50c0dc8fa041..fc37456919d0 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -5,13 +5,9 @@ let version = virtualbox.version; xserverVListFunc = builtins.elemAt (lib.splitVersion xorg.xorgserver.version); - # Forced to 1.18 in - # as it even fails to build otherwise. Still, override this even here, - # in case someone does just a standalone build - # (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" || abi == "120" || abi == "211" then "118" else abi; + # Forced to 1.18; vboxvideo doesn't seem to provide any newer ABI, + # and nixpkgs doesn't support older ABIs anymore. + xserverABI = "118"; # Specifies how to patch binaries to make sure that libraries loaded using # dlopen are found. We grep binaries for specific library names and patch