diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-04-20 18:29:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-04-20 19:31:17 +0200 |
| commit | b9e4383b0a438c1666722c948b9f418e4e21171a (patch) | |
| tree | 5dda49607ab1637ee79b98097cd43920c54d7ff6 /pkgs/applications | |
| parent | b424ce3fd2fee6ba4697e806966f62f3f6cb72e4 (diff) | |
| parent | b8c192b98e13d09be3789e527f1f2358d46666f5 (diff) | |
Merge #169177: linuxPackages.virtualboxGuestAdditions: xserverABI
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 10 |
1 files 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 865dcad157bd9..fc37456919d08 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 <nixpkgs/nixos/modules/services/x11/xserver.nix> - # 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" 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 |