diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-12 21:06:59 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-12 21:07:49 +0100 |
| commit | 31eba21d1dab7da2e75be229c542990e8f4b56b6 (patch) | |
| tree | a54beda267bb336441f2077d4ea0237bc5a6f92d /pkgs/applications/virtualization/virtualbox | |
| parent | 2dba30af721d452000917a55a21a722331b113df (diff) | |
| download | nixlib-31eba21d1dab7da2e75be229c542990e8f4b56b6.tar nixlib-31eba21d1dab7da2e75be229c542990e8f4b56b6.tar.gz nixlib-31eba21d1dab7da2e75be229c542990e8f4b56b6.tar.bz2 nixlib-31eba21d1dab7da2e75be229c542990e8f4b56b6.tar.lz nixlib-31eba21d1dab7da2e75be229c542990e8f4b56b6.tar.xz nixlib-31eba21d1dab7da2e75be229c542990e8f4b56b6.tar.zst nixlib-31eba21d1dab7da2e75be229c542990e8f4b56b6.zip | |
virtualbox: force xorg-server-1.18 for now
This is getting a little hacky, but hopefully it won't break anything.
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index d73c18badb19..6e58d42a1cb5 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -4,7 +4,14 @@ let version = virtualbox.version; xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version); - xserverABI = xserverVListFunc 0 + xserverVListFunc 1; + + # 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" then "118" else abi; in stdenv.mkDerivation { |