pyrox.dev
Merge #169177: linuxPackages.virtualboxGuestAdditions: xserverABI
+3
-7
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+3
-7
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
···
5
5
version = virtualbox.version;
6
6
xserverVListFunc = builtins.elemAt (lib.splitVersion xorg.xorgserver.version);
7
7
8
-
# Forced to 1.18 in <nixpkgs/nixos/modules/services/x11/xserver.nix>
9
-
# as it even fails to build otherwise. Still, override this even here,
10
-
# in case someone does just a standalone build
11
-
# (not via videoDrivers = ["vboxvideo"]).
12
-
# It's likely to work again in some future update.
13
-
xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1;
14
-
in if abi == "119" || abi == "120" then "118" else abi;
8
+
# Forced to 1.18; vboxvideo doesn't seem to provide any newer ABI,
9
+
# and nixpkgs doesn't support older ABIs anymore.
10
+
xserverABI = "118";
15
11
16
12
# Specifies how to patch binaries to make sure that libraries loaded using
17
13
# dlopen are found. We grep binaries for specific library names and patch