cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #169177: linuxPackages.virtualboxGuestAdditions: xserverABI

Browse source
This commit is contained in:
Vladimír Čunát 2022-04-20 18:29:58 +02:00
commit b9e4383b0a
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file

@ -5,13 +5,9 @@ let
version = virtualbox.version; version = virtualbox.version;
xserverVListFunc = builtins.elemAt (lib.splitVersion xorg.xorgserver.version); xserverVListFunc = builtins.elemAt (lib.splitVersion xorg.xorgserver.version);
# Forced to 1.18 in <nixpkgs/nixos/modules/services/x11/xserver.nix> # Forced to 1.18; vboxvideo doesn't seem to provide any newer ABI,
# as it even fails to build otherwise. Still, override this even here, # and nixpkgs doesn't support older ABIs anymore.
# in case someone does just a standalone build xserverABI = "118";
# (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;
# Specifies how to patch binaries to make sure that libraries loaded using # Specifies how to patch binaries to make sure that libraries loaded using
# dlopen are found. We grep binaries for specific library names and patch # dlopen are found. We grep binaries for specific library names and patch